From 9c3c9bf7dfaf0f1c162a6aa06fdb7ca81711f70d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 11:49:07 +0800
Subject: [PATCH] #回退流程相关
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 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 3b57330..aacfa97 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,7 @@
private Boolean curr;
- public static List<SettleDto> init(Plan plan, User manager) {
+ 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,21 +45,23 @@
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(manager.getId());
- dto.setUsername(manager.getNickname());
+ dto.setTitle("鍞墠瀹℃牳");
+ dto.setUserId(planLeader.getId());
+ dto.setUsername(planLeader.getNickname());
list.add(dto);
break;
case 3:
- dto.setTitle("鍞墠瀹℃牳");
- list.add(dto);
- break;
- case 4:
dto.setTitle("瑙勫垝鍛樺鏍�");
list.add(dto);
break;
- case 5:
+ case 4:
dto.setTitle("瀹℃壒閫氳繃");
dto.setUserId(plan.getUserId());
dto.setUsername(plan.getUserId$());
@@ -122,19 +124,22 @@
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
- case 0:
+// 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() + "鍒涘缓浜嗗鎵�");
dto.setUserId(user.getId());
- dto.setUsername(user.getUsername());
+ dto.setUsername(user.getNickname());
dto.setTime(DateUtils.convert(new Date()));
dto.setCurr(Boolean.TRUE);
- list.add(dto);
- break;
- case 1:
- dto.setTitle("鎻愪氦鎶ラ攢");
- dto.setUserId(user.getId());
- dto.setUsername(user.getNickname());
list.add(dto);
break;
case 2:
@@ -205,7 +210,7 @@
return list;
}
- public static List<SettleDto> initSalesPricing(User manager ,User user,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++) {
SettleDto dto = new SettleDto();
@@ -234,6 +239,8 @@
break;
case 3:
dto.setTitle(names.get(i));
+ dto.setUserId(userUp.getId());
+ dto.setUsername(userUp.getUsername());
list.add(dto);
break;
default:
@@ -278,6 +285,8 @@
break;
case 4:
dto.setTitle(names.get(i));
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getUsername());
list.add(dto);
break;
default:
--
Gitblit v1.9.1