From 064e2b95e2a88f9679a1834e4dec95038c0482ff Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 15:31:34 +0800
Subject: [PATCH] #流程相关
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 8f3ecad..6b61a77 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -124,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:
@@ -207,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();
@@ -215,9 +218,9 @@
switch (i) {
case 0:
dto.setTitle("寮�濮�");
- dto.setMsg(user.getUsername() + names.get(i));
- dto.setUserId(user.getId());
- dto.setUsername(user.getUsername());
+ dto.setMsg(userUp.getUsername() + names.get(i));
+ dto.setUserId(userUp.getId());
+ dto.setUsername(userUp.getUsername());
dto.setTime(DateUtils.convert(new Date()));
dto.setCurr(Boolean.TRUE);
list.add(dto);
@@ -236,6 +239,8 @@
break;
case 3:
dto.setTitle(names.get(i));
+ dto.setUserId(userUp.getId());
+ dto.setUsername(userUp.getUsername());
list.add(dto);
break;
default:
@@ -280,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