From 8bdf67ac86644d1ba285646ca26b413c58dc7330 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 16 十月 2023 14:46:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 a1bb707..4fa7f41 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);
@@ -210,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();
@@ -239,6 +239,42 @@
break;
case 3:
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> 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();
+ dto.setStep(i);
+ switch (i) {
+ case 0:
+ 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(userUp.getId());
+ dto.setUsername(userUp.getUsername());
list.add(dto);
break;
default:
@@ -283,6 +319,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