From 46898bbf94063b368d52ac2bd3ba624e4a9f77e6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 17:36:58 +0800
Subject: [PATCH] #bug修复，双红*问题
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 122 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 3 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 16abfab..3b57330 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -74,7 +74,7 @@
public static List<SettleDto> initPriQuote(Plan plan, User manager ,User president,User user) {
List<SettleDto> list = new ArrayList<>();
- for (int i = 1; i < 6; i++) {
+ for (int i = 1; i < 5; i++) {
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
@@ -118,17 +118,23 @@
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 = 1; i < 7; i++) {
+ for (int i = 0; i < 7; i++) {
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
- case 1:
+ 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.setUserId(user.getId());
+ dto.setUsername(user.getNickname());
list.add(dto);
break;
case 2:
@@ -172,4 +178,114 @@
return list;
}
+ 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();
+ dto.setStep(i);
+ switch (i) {
+ case 1:
+ dto.setTitle("鎻愪氦鍑哄樊");
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getNickname());
+ dto.setMsg(user.getNickname()+"鎻愪氦鍑哄樊鐢宠");
+ dto.setTime(DateUtils.convert(new Date()));
+ list.add(dto);
+ break;
+ case 2:
+ dto.setTitle("閮ㄩ棬缁忕悊瀹℃牳");
+ dto.setUserId(manager.getId());
+ dto.setUsername(manager.getNickname());
+ list.add(dto);
+ break;
+ default:
+ break;
+ }
+ }
+ return list;
+ }
+
+ public static List<SettleDto> initSalesPricing(User manager ,User user,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(manager.getId());
+ dto.setUsername(manager.getNickname());
+ list.add(dto);
+ break;
+ case 3:
+ dto.setTitle(names.get(i));
+ 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 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(manager.getId());
+ dto.setUsername(manager.getNickname());
+ list.add(dto);
+ break;
+ case 3:
+ dto.setTitle(names.get(i));
+ dto.setUserId(president.getId());
+ dto.setUsername(president.getNickname());
+ list.add(dto);
+ break;
+ case 4:
+ dto.setTitle(names.get(i));
+ list.add(dto);
+ break;
+ default:
+ break;
+ }
+ }
+ return list;
+ }
+
+
}
--
Gitblit v1.9.1