From bf2fbd9f3e90dd2ef508c5944ae63491397b42ae Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 10:35:26 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/Plan.java |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 60 insertions(+), 7 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 25e5a1c..4e02dbf 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -234,6 +234,24 @@
     @ApiModelProperty(value= "娉ㄩ噴")
     private String memo;
 
+    /**
+     * 椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}
+     */
+    @ApiModelProperty(value= "椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}")
+    private Integer step;
+
+    /**
+     * 涓氬姟鍛樿仈绯绘柟寮�
+     */
+    @ApiModelProperty(value= "涓氬姟鍛樿仈绯绘柟寮�")
+    private String userXmlSelPhone;
+
+    /**
+     * 鑺傜偣璐熻矗浜�
+     */
+    @ApiModelProperty(value= "鑺傜偣璐熻矗浜�")
+    private Long director;
+
     public Plan() {}
 
     public String getHostId$(){
@@ -241,6 +259,16 @@
         Host host = service.selectById(this.hostId);
         if (!Cools.isEmpty(host)){
             return String.valueOf(host.getName());
+        }
+        return null;
+    }
+
+    public String getDirector$(){
+        if (this.director==null) return "";
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.director);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
         }
         return null;
     }
@@ -259,6 +287,15 @@
         PlanType planType = service.selectById(this.planType);
         if (!Cools.isEmpty(planType)){
             return String.valueOf(planType.getName());
+        }
+        return null;
+    }
+
+    public Integer getPLType$(){
+        PlanTypeService service = SpringUtils.getBean(PlanTypeService.class);
+        PlanType planType = service.selectById(this.planType);
+        if (!Cools.isEmpty(planType)){
+            return planType.getType();
         }
         return null;
     }
@@ -298,6 +335,9 @@
     }
 
     public String getPlanNeed$(){
+        if (Cools.isEmpty(this.planNeed)){
+            return null;
+        }
         PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
         String[] planNeeds = this.planNeed.split("-");
         String name="";
@@ -345,15 +385,15 @@
     public String getSettle$(){
         if (null == this.settle){ return null; }
         switch (this.settle){
+//            case 1:
+//                return "绛夊緟缁勯暱瀹℃牳";
             case 1:
-                return "寮�濮�";
+                return "绛夊緟鍞墠鍒嗛厤瑙勫垝鍛�";
             case 2:
-                return "缁勯暱瀹℃牳";
+                return "绛夊緟瑙勫垝鍛樻彁浜�";
             case 3:
-                return "鍞墠瀹℃牳";
+                return "瑙勫垝鍛樺凡鎻愪氦";
             case 4:
-                return "瑙勫垝鍛樺鏍�";
-            case 5:
                 return "瀹℃壒閫氳繃";
             default:
                 return String.valueOf(this.settle);
@@ -361,8 +401,19 @@
     }
 
     public String getPlanner$(){
+        if (this.planner==null) return "鏈垎閰�";
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.planner);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return "";
+    }
+
+    public String getNowHeadman$(){
+        PlanTypeService planTypeService = SpringUtils.getBean(PlanTypeService.class);
+        PlanType planType = planTypeService.selectById(this.planType);
+        User user = planTypeService.findPlanLeader(planType);
         if (!Cools.isEmpty(user)){
             return String.valueOf(user.getNickname());
         }
@@ -372,10 +423,12 @@
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){
+            case 2:
+                return "寮�濮嬫牳浠�";
             case 1:
-                return "姝ｅ父";
+                return "绛夊緟鏍镐环";
             case 0:
-                return "绂佺敤";
+                return "鏈畬鎴�";
             default:
                 return String.valueOf(this.status);
         }

--
Gitblit v1.9.1