From f6c36a54e184d82b4fdb86982292f22e927fb668 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 01 十一月 2023 15:58:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 6b61a77..ce79013 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -96,7 +96,7 @@
list.add(dto);
break;
case 3:
- dto.setTitle("鎬昏鍔炲鏍�");
+ dto.setTitle("鎬荤粡鍔炲鏍�");
dto.setUserId(president.getId());
dto.setUsername(president.getNickname());
list.add(dto);
@@ -218,9 +218,9 @@
switch (i) {
case 0:
dto.setTitle("寮�濮�");
- dto.setMsg(userUp.getUsername() + names.get(i));
- dto.setUserId(userUp.getId());
- dto.setUsername(userUp.getUsername());
+ dto.setMsg(user.getUsername() + names.get(i));
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getUsername());
dto.setTime(DateUtils.convert(new Date()));
dto.setCurr(Boolean.TRUE);
list.add(dto);
@@ -250,7 +250,7 @@
return list;
}
- public static List<SettleDto> initContract(User manager ,User user,User president,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++) {
SettleDto dto = new SettleDto();
@@ -273,6 +273,40 @@
break;
case 2:
dto.setTitle(names.get(i));
+ dto.setUserId(userUp.getId());
+ dto.setUsername(userUp.getUsername());
+ list.add(dto);
+ break;
+ default:
+ break;
+ }
+ }
+ return list;
+ }
+
+ 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++) {
+ SettleDto dto = new SettleDto();
+ dto.setStep(i);
+ switch (i) {
+ case 1:
+ dto.setTitle("寮�濮�");
+ dto.setMsg(user.getUsername() + names.get(i));
+ 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(names.get(i));
+// dto.setUserId(user.getId());
+// dto.setUsername(user.getNickname());
+// list.add(dto);
+// break;
+ case 2:
+ dto.setTitle(names.get(i));
dto.setUserId(manager.getId());
dto.setUsername(manager.getNickname());
list.add(dto);
--
Gitblit v1.9.1