From 41df92a5ee14f19e7453cf0674c1537da46be2ca Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:42:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 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 9339cda..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,7 @@
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.*;
@@ -101,6 +102,20 @@
private String comment;
/**
+ * 宸ヤ綔鍐呭
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍐呭")
+ @TableField("work_content")
+ private String workContent;
+
+ /**
+ * 宸ヤ綔鐩殑
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐩殑")
+ @TableField("work_purpose")
+ private String workPurpose;
+
+ /**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
@@ -163,7 +178,7 @@
@ApiModelProperty(value= "鍛ㄦ姤ID")
@TableId(value = "weekly_id", type = IdType.INPUT)
@TableField("weekly_id")
- private Integer weeklyId;
+ private Long weeklyId;
/**
* 鐢叉柟鍗曚綅ID
@@ -186,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;
@@ -306,6 +358,15 @@
}
}
+ 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);
--
Gitblit v1.9.1