From 8b109f923dc7c2d5c5bd351a03a5277670962aac Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 04 十二月 2023 13:05:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/Plan.java |   98 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index 5837250..dfb4da1 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -73,9 +73,9 @@
     private Long orderId;
 
     /**
-     * 鐢叉柟鍗曚綅
+     * 瀹㈡埛淇℃伅
      */
-    @ApiModelProperty(value = "鐢叉柟鍗曚綅")
+    @ApiModelProperty(value = "瀹㈡埛淇℃伅")
     @TableField("cstmr_id")
     private Long cstmrId;
 
@@ -174,9 +174,9 @@
     private String files;
 
     /**
-     * 杩涘害 1: 寮�濮�  2: 缁勯暱瀹℃牳  3: 鍞墠缁勯暱瀹℃牳  4: 瑙勫垝鍛樺鏍�  5: 瀹℃壒閫氳繃
+     * 杩涘害 1: 寮�濮�  2: 鍞墠瀹℃牳  3: 瑙勫垝鍛樺鏍�  4: 瀹℃壒閫氳繃
      */
-    @ApiModelProperty(value = "杩涘害 1: 寮�濮�  2: 缁勯暱瀹℃牳  3: 鍞墠瀹℃牳  4: 瑙勫垝鍛樺鏍�  5: 瀹℃壒閫氳繃  ")
+    @ApiModelProperty(value = "杩涘害 1: 寮�濮�  2: 鍞墠瀹℃牳  3: 瑙勫垝鍛樺鏍�  4: 瀹℃壒閫氳繃  ")
     private Integer settle;
 
     /**
@@ -279,6 +279,13 @@
     @TableField("assistant_host_sign")
     private Integer assistantHostSign;
 
+    /**
+     * 娴佺▼闀垮害
+     */
+    @ApiModelProperty(value= "娴佺▼闀垮害")
+    @TableField("settle_size")
+    private Integer settleSize;
+
     public Plan() {
     }
 
@@ -351,6 +358,47 @@
         return null;
     }
 
+    public String getStatusAll$(){
+        if (this.status2>3 || this.getAssistantHostSign()==1){
+            return getStatus$();
+        }else {
+            return "闆嗘垚"+getStatus$()+"/"+"璐ф灦"+getStatus2$();
+        }
+
+    }
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 3:
+                return "瀹屾垚鏍镐环";
+            case 2:
+                return "寮�濮嬫牳浠�";
+            case 1:
+                return "绛夊緟鏍镐环";
+            case 0:
+                return "鍒濆";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
+    public String getStatus2$(){
+        if (null == this.status2){ return null; }
+        switch (this.status2){
+            case 3:
+                return "瀹屾垚鏍镐环";
+            case 2:
+                return "寮�濮嬫牳浠�";
+            case 1:
+                return "绛夊緟鏍镐环";
+            case 0:
+                return "鍒濆";
+            default:
+                return String.valueOf(this.status2);
+        }
+    }
+
     public String getUserId$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.userId);
@@ -416,6 +464,20 @@
         }
     }
 
+    public String getAssistantHostSign$() {
+        if (null == this.assistantHostSign) {
+            return null;
+        }
+        switch (this.assistantHostSign) {
+            case 1:
+                return "鍓祦绋�";
+            case 0:
+                return "涓绘祦绋�";
+            default:
+                return String.valueOf(this.assistantHostSign);
+        }
+    }
+
     public String getFinishTime$() {
         if (Cools.isEmpty(this.finishTime)) {
             return "";
@@ -441,9 +503,17 @@
         if (null == this.settle) {
             return null;
         }
+        if (this.getSettleSize()==2){
+            switch (this.settle) {
+                case 1:
+                    return "绛夊緟纭";
+                case 2:
+                    return "瀹℃壒閫氳繃";
+                default:
+                    return String.valueOf(this.settle);
+            }
+        }
         switch (this.settle) {
-//            case 1:
-//                return "绛夊緟缁勯暱瀹℃牳";
             case 1:
                 return "绛夊緟鍞墠鍒嗛厤瑙勫垝鍛�";
             case 2:
@@ -475,22 +545,6 @@
             return String.valueOf(user.getNickname());
         }
         return null;
-    }
-
-    public String getStatus$() {
-        if (null == this.status) {
-            return null;
-        }
-        switch (this.status) {
-            case 2:
-                return "寮�濮嬫牳浠�";
-            case 1:
-                return "绛夊緟鏍镐环";
-            case 0:
-                return "鏈畬鎴�";
-            default:
-                return String.valueOf(this.status);
-        }
     }
 
     public String getCreateBy$() {

--
Gitblit v1.9.1