From aa0161bf05195ccb00bc1d8da4b1b8218f93f4d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 16:14:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 73 +++++++++++++++++-------------------
1 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/model/SettleDto.java b/src/main/java/com/zy/crm/common/model/SettleDto.java
index ce79013..c9c1066 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -30,7 +30,27 @@
private Boolean curr;
- public static List<SettleDto> init(Plan plan, User manager,User planLeader) {
+ public static List<SettleDto> InItFlowPath(List<User> users, List<String> names, int nodes) {
+ List<SettleDto> list = new ArrayList<>();
+ for (int i = 0; i < nodes; i++) {
+ SettleDto dto = new SettleDto();
+ dto.setStep(i);
+ if (i == 0) {
+ dto.setTitle("寮�濮�");
+ dto.setMsg(users.get(i).getUsername() + names.get(i));
+ dto.setTime(DateUtils.convert(new Date()));
+ dto.setCurr(Boolean.TRUE);
+ } else {
+ dto.setTitle(names.get(i));
+ }
+ dto.setUserId(users.get(i).getId());
+ dto.setUsername(users.get(i).getUsername());
+ list.add(dto);
+ }
+ return list;
+ }
+
+ public static List<SettleDto> init(Plan plan, User manager, User planLeader) {
List<SettleDto> list = new ArrayList<>();
for (int i = 1; i < 6; i++) {
SettleDto dto = new SettleDto();
@@ -45,12 +65,6 @@
dto.setCurr(Boolean.TRUE);
list.add(dto);
break;
-// case 2:
-// dto.setTitle("缁勯暱瀹℃牳");
-// dto.setUserId(manager.getId());
-// dto.setUsername(manager.getNickname());
-// list.add(dto);
-// break;
case 2:
dto.setTitle("鍞墠瀹℃牳");
dto.setUserId(planLeader.getId());
@@ -74,7 +88,7 @@
return list;
}
- public static List<SettleDto> initPriQuote(Plan plan, User manager ,User president,User user) {
+ public static List<SettleDto> initPriQuote(Plan plan, User manager, User president, User user) {
List<SettleDto> list = new ArrayList<>();
for (int i = 1; i < 5; i++) {
SettleDto dto = new SettleDto();
@@ -101,10 +115,6 @@
dto.setUsername(president.getNickname());
list.add(dto);
break;
-// case 4:
-// dto.setTitle("涓氬姟鍛樺鏍�");
-// list.add(dto);
-// break;
case 4:
dto.setTitle("瀹℃壒閫氳繃");
dto.setUserId(plan.getUserId());
@@ -118,21 +128,12 @@
return list;
}
- public static List<SettleDto> initPriQuote(ReimburseOnline reimburseOnline, User manager , User president3, User president4,User president5,User president6,User user) {
+ public static List<SettleDto> initPriQuote(ReimburseOnline reimburseOnline, User manager, User president3, User president4, User president5, User president6, User user) {
List<SettleDto> list = new ArrayList<>();
for (int i = 0; i < 7; i++) {
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
-// case 0:
-// dto.setTitle("寮�濮�");
-// dto.setMsg(user.getUsername() + "鍒涘缓浜嗗鎵�");
-// dto.setUserId(user.getId());
-// dto.setUsername(user.getUsername());
-// dto.setTime(DateUtils.convert(new Date()));
-// dto.setCurr(Boolean.TRUE);
-// list.add(dto);
-// break;
case 1:
dto.setTitle("寮�濮�");
dto.setMsg(user.getUsername() + "鍒涘缓浜嗗鎵�");
@@ -149,33 +150,29 @@
list.add(dto);
break;
case 3:
- dto.setTitle(president3.getUsername()+"瀹℃牳");
+ dto.setTitle(president3.getUsername() + "瀹℃牳");
dto.setUserId(president3.getId());
dto.setUsername(president3.getNickname());
list.add(dto);
break;
case 4:
- dto.setTitle(president4.getUsername()+"瀹℃牳");
+ dto.setTitle(president4.getUsername() + "瀹℃牳");
dto.setUserId(president4.getId());
dto.setUsername(president4.getNickname());
list.add(dto);
break;
case 5:
- dto.setTitle(president5.getUsername()+"瀹℃牳");
+ dto.setTitle(president5.getUsername() + "瀹℃牳");
dto.setUserId(president5.getId());
dto.setUsername(president5.getNickname());
list.add(dto);
break;
case 6:
- dto.setTitle(president6.getUsername()+"瀹℃牳");
+ dto.setTitle(president6.getUsername() + "瀹℃牳");
dto.setUserId(president6.getId());
dto.setUsername(president6.getNickname());
list.add(dto);
break;
-// case 4:
-// dto.setTitle("涓氬姟鍛樺鏍�");
-// list.add(dto);
-// break;
default:
break;
}
@@ -183,7 +180,7 @@
return list;
}
- public static List<SettleDto> initBusiness(User manager ,User user) {
+ public static List<SettleDto> initBusiness(User manager, User user) {
List<SettleDto> list = new ArrayList<>();
for (int i = 0; i < 3; i++) {
SettleDto dto = new SettleDto();
@@ -193,7 +190,7 @@
dto.setTitle("鎻愪氦鍑哄樊");
dto.setUserId(user.getId());
dto.setUsername(user.getNickname());
- dto.setMsg(user.getNickname()+"鎻愪氦鍑哄樊鐢宠");
+ dto.setMsg(user.getNickname() + "鎻愪氦鍑哄樊鐢宠");
dto.setTime(DateUtils.convert(new Date()));
list.add(dto);
break;
@@ -210,9 +207,9 @@
return list;
}
- public static List<SettleDto> initSalesPricing(User manager ,User user,User userUp,List<String> names ,int nodes) {
+ public static List<SettleDto> initSalesPricing(User manager, User user, User userUp, List<String> names, int nodes) {
List<SettleDto> list = new ArrayList<>();
- for (int i = 0; i < nodes+1; i++) {
+ for (int i = 0; i < nodes + 1; i++) {
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
@@ -250,9 +247,9 @@
return list;
}
- public static List<SettleDto> initSalesPricingPriOnline2(User user,User userUp,List<String> names ,int nodes) {
+ public static List<SettleDto> initSalesPricingPriOnline2(User user, User userUp, List<String> names, int nodes) {
List<SettleDto> list = new ArrayList<>();
- for (int i = 0; i < nodes+1; i++) {
+ for (int i = 0; i < nodes + 1; i++) {
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
@@ -284,9 +281,9 @@
return list;
}
- public static List<SettleDto> initContract(User manager ,User user,User president,List<String> names ,int nodes) {
+ public static List<SettleDto> initContract(User manager, User user, User president, List<String> names, int nodes) {
List<SettleDto> list = new ArrayList<>();
- for (int i = 0; i < nodes+1; i++) {
+ for (int i = 0; i < nodes + 1; i++) {
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
--
Gitblit v1.9.1