From 16f7de7423ef2cf81e92dd1b7568d9d161acee47 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 03 四月 2024 12:41:53 +0800
Subject: [PATCH] #周计划

---
 src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java |   64 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
index bfb4674..38e4339 100644
--- a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
@@ -5,6 +5,8 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.crm.manager.service.CstmrService;
+import com.zy.crm.manager.service.WeeklyCostTypesService;
 import com.zy.crm.system.entity.*;
 import com.zy.crm.system.service.*;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -74,13 +76,13 @@
     private Long deptId;
 
     /**
-     * 鐘舵�� 3: 宸插叧闂�  2: 闇�澶勭悊  1: 杩涜涓�  0: 鏈紑濮�  
+     * 鐘舵�� 3: 宸插叧闂�  2: 闇�澶勭悊  1: 杩涜涓�  0: 鏈紑濮�
      */
     @ApiModelProperty(value= "鐘舵�� 3: 宸插叧闂�  2: 闇�澶勭悊  1: 杩涜涓�  0: 鏈紑濮�  ")
     private Integer status;
 
     /**
-     * 杩涘害 0: 榛樿  1: 寮�濮�  2: 缁勯暱寰呭  3: 缁勯暱瀹℃牳  4: 瑙勫垝寰呭  5: 瑙勫垝瀹℃牳  6: 瀹℃壒涓�  7: 瀹℃壒閫氳繃  
+     * 杩涘害 0: 榛樿  1: 寮�濮�  2: 缁勯暱寰呭  3: 缁勯暱瀹℃牳  4: 瑙勫垝寰呭  5: 瑙勫垝瀹℃牳  6: 瀹℃壒涓�  7: 瀹℃壒閫氳繃
      */
     @ApiModelProperty(value= "杩涘害 0: 榛樿  1: 寮�濮�  2: 缁勯暱寰呭  3: 缁勯暱瀹℃牳  4: 瑙勫垝寰呭  5: 瑙勫垝瀹℃牳  6: 瀹℃壒涓�  7: 瀹℃壒閫氳繃  ")
     private Integer settle;
@@ -150,6 +152,36 @@
     private String weeklyMatter;
 
     /**
+     * 鐪�
+     */
+    @ApiModelProperty(value= "鐪�")
+    private String province;
+
+    /**
+     * 甯�
+     */
+    @ApiModelProperty(value= "甯�")
+    private String city;
+
+    /**
+     * 鍘�
+     */
+    @ApiModelProperty(value= "鍘�")
+    private String district;
+
+    /**
+     * 闀�
+     */
+    @ApiModelProperty(value= "闀�")
+    private String town;
+
+    /**
+     * 璇︾粏鍦板潃
+     */
+    @ApiModelProperty(value= "璇︾粏鍦板潃")
+    private String addr;
+
+    /**
      * 璐熻矗浜�
      */
     @ApiModelProperty(value= "璐熻矗浜�")
@@ -175,7 +207,7 @@
     @ApiModelProperty(value= "鍛ㄦ姤ID")
     @TableId(value = "weekly_id", type = IdType.INPUT)
     @TableField("weekly_id")
-    private Integer weeklyId;
+    private Long weeklyId;
 
     /**
      * 鐢叉柟鍗曚綅ID
@@ -200,7 +232,11 @@
 
     public WeeklyDailyReality() {}
 
-    public WeeklyDailyReality(Date dailyTime,Long userId,Long hostId,Long deptId,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String weeklyMatter,Long director,Integer settleSize,Integer settleCurrent,Integer weeklyId,Long cstmrId,Integer weeklyDay,String memo) {
+    public WeeklyDailyReality(Integer weeklyDay) {
+        this.weeklyDay = weeklyDay;
+    }
+
+    public WeeklyDailyReality(Date dailyTime,Long userId,Long hostId,Long deptId,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String weeklyMatter,Long director,Integer settleSize,Integer settleCurrent,Long weeklyId,Long cstmrId,Integer weeklyDay,String memo) {
         this.dailyTime = dailyTime;
         this.userId = userId;
         this.hostId = hostId;
@@ -246,6 +282,17 @@
 //            null    // 澶囨敞
 //    );
 
+
+    public String getWeeklyDay$(){
+        if (null == this.weeklyDay){ return ""; }
+        WeeklyCostTypesService weeklyCostTypesService = SpringUtils.getBean(WeeklyCostTypesService.class);
+        WeeklyCostTypes weeklyCostTypes = weeklyCostTypesService.selectById(this.weeklyDay);
+        if (!Cools.isEmpty(weeklyCostTypes)){
+            return String.valueOf(weeklyCostTypes.getTypeName());
+        }
+        return null;
+    }
+
     public String getDailyTime$(){
         if (Cools.isEmpty(this.dailyTime)){
             return "";
@@ -280,6 +327,15 @@
         return null;
     }
 
+    public String getCstmrId$(){
+        CstmrService service = SpringUtils.getBean(CstmrService.class);
+        Cstmr cstmr = service.selectById(this.cstmrId);
+        if (!Cools.isEmpty(cstmr)){
+            return String.valueOf(cstmr.getName());
+        }
+        return null;
+    }
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){

--
Gitblit v1.9.1