From b523cf62af9369901cdeff2b2ae188a0af856558 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:47:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java |   99 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
index ec4b599..f02bd09 100644
--- a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.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;
@@ -41,6 +43,7 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -97,6 +100,20 @@
      */
     @ApiModelProperty(value= "璇勮")
     private String comment;
+
+    /**
+     * 宸ヤ綔鍐呭
+     */
+    @ApiModelProperty(value= "宸ヤ綔鍐呭")
+    @TableField("work_content")
+    private String workContent;
+
+    /**
+     * 宸ヤ綔鐩殑
+     */
+    @ApiModelProperty(value= "宸ヤ綔鐩殑")
+    @TableField("work_purpose")
+    private String workPurpose;
 
     /**
      * 娣诲姞浜哄憳
@@ -161,7 +178,7 @@
     @ApiModelProperty(value= "鍛ㄦ姤ID")
     @TableId(value = "weekly_id", type = IdType.INPUT)
     @TableField("weekly_id")
-    private Integer weeklyId;
+    private Long weeklyId;
 
     /**
      * 鐢叉柟鍗曚綅ID
@@ -184,9 +201,46 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鐪�
+     */
+    @ApiModelProperty(value= "鐪�")
+    private String province;
+
+    /**
+     * 甯�
+     */
+    @ApiModelProperty(value= "甯�")
+    private String city;
+
+    /**
+     * 鍘�
+     */
+    @ApiModelProperty(value= "鍘�")
+    private String district;
+
+    /**
+     * 闀�
+     */
+    @ApiModelProperty(value= "闀�")
+    private String town;
+
+    /**
+     * 鐢叉柟鍗曚綅ID
+     */
+    @ApiModelProperty(value= "鐢叉柟鍗曚綅ID")
+    @TableField("cstmr_name")
+    private String cstmrName;
+
+    /**
+     * 璇︾粏鍦板潃
+     */
+    @ApiModelProperty(value= "璇︾粏鍦板潃")
+    private String addr;
+
     public WeeklyDailyPlan() {}
 
-    public WeeklyDailyPlan(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 WeeklyDailyPlan(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;
@@ -207,6 +261,28 @@
         this.cstmrId = cstmrId;
         this.weeklyDay = weeklyDay;
         this.memo = memo;
+    }
+
+    public WeeklyDailyPlan(Integer weeklyDay) {
+        this.weeklyDay = weeklyDay;
+//        this.userId = userId;
+//        this.hostId = hostId;
+//        this.deptId = deptId;
+//        this.status = status;
+//        this.settle = settle;
+//        this.settleMsg = settleMsg;
+//        this.comment = comment;
+//        this.createBy = createBy;
+//        this.createTime = createTime;
+//        this.updateBy = updateBy;
+//        this.updateTime = updateTime;
+//        this.weeklyMatter = weeklyMatter;
+//        this.director = director;
+//        this.settleSize = settleSize;
+//        this.settleCurrent = settleCurrent;
+//        this.weeklyId = weeklyId;
+//        this.cstmrId = cstmrId;
+//        this.memo = memo;
     }
 
 //    WeeklyDailyPlan weeklyDailyPlan = new WeeklyDailyPlan(
@@ -282,6 +358,25 @@
         }
     }
 
+    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 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 getSettle$(){
         if (null == this.settle){ return null; }
         switch (this.settle){

--
Gitblit v1.9.1