From 564bf7ab6a639c2c4557d35b8fd9b51dca60a738 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:32:34 +0800
Subject: [PATCH] #规则完善

---
 src/main/java/com/zy/crm/common/model/SettleDto.java |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 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 8554c69..83c2e68 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -2,6 +2,7 @@
 
 import com.core.common.DateUtils;
 import com.zy.crm.manager.entity.Plan;
+import com.zy.crm.system.entity.User;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -26,11 +27,11 @@
 
     private String time;
 
-    private Boolean curr = Boolean.FALSE;
+    private Boolean curr;
 
-    public static List<SettleDto> init(Plan plan) {
+    public static List<SettleDto> init(Plan plan, User manager) {
         List<SettleDto> list = new ArrayList<>();
-        for (int i = 1; i < 5; i++) {
+        for (int i = 1; i < 6; i++) {
             SettleDto dto = new SettleDto();
             dto.setStep(i);
             switch (i) {
@@ -45,14 +46,66 @@
                     break;
                 case 2:
                     dto.setTitle("缁勯暱瀹℃牳");
+                    dto.setUserId(manager.getId());
+                    dto.setUsername(manager.getNickname());
                     list.add(dto);
                     break;
                 case 3:
-                    dto.setTitle("瑙勫垝瀹℃牳");
+                    dto.setTitle("鍞墠瀹℃牳");
                     list.add(dto);
                     break;
                 case 4:
+                    dto.setTitle("瑙勫垝鍛樺鏍�");
+                    list.add(dto);
+                    break;
+                case 5:
                     dto.setTitle("瀹℃壒閫氳繃");
+                    dto.setUserId(plan.getUserId());
+                    dto.setUsername(plan.getUserId$());
+                    list.add(dto);
+                    break;
+                default:
+                    break;
+            }
+        }
+        return list;
+    }
+
+    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++) {
+            SettleDto dto = new SettleDto();
+            dto.setStep(i);
+            switch (i) {
+                case 1:
+                    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 2:
+                    dto.setTitle("閮ㄩ棬缁忕悊瀹℃牳");
+                    dto.setUserId(manager.getId());
+                    dto.setUsername(manager.getNickname());
+                    list.add(dto);
+                    break;
+                case 3:
+                    dto.setTitle("鎬昏鍔炲鏍�");
+                    dto.setUserId(president.getId());
+                    dto.setUsername(president.getNickname());
+                    list.add(dto);
+                    break;
+//                case 4:
+//                    dto.setTitle("涓氬姟鍛樺鏍�");
+//                    list.add(dto);
+//                    break;
+                case 4:
+                    dto.setTitle("瀹℃壒閫氳繃");
+                    dto.setUserId(plan.getUserId());
+                    dto.setUsername(plan.getUserId$());
                     list.add(dto);
                     break;
                 default:

--
Gitblit v1.9.1