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/WeeklyDailyReality.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 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..1c15589 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,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.crm.common.utils.Synchro;
+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 +77,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 +153,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 +208,7 @@
@ApiModelProperty(value= "鍛ㄦ姤ID")
@TableId(value = "weekly_id", type = IdType.INPUT)
@TableField("weekly_id")
- private Integer weeklyId;
+ private Long weeklyId;
/**
* 鐢叉柟鍗曚綅ID
@@ -184,6 +217,13 @@
@TableId(value = "cstmr_id", type = IdType.INPUT)
@TableField("cstmr_id")
private Long cstmrId;
+
+ /**
+ * 鐢叉柟鍗曚綅ID
+ */
+ @ApiModelProperty(value= "鐢叉柟鍗曚綅ID")
+ @TableField("cstmr_name")
+ private String cstmrName;
/**
* 鏄熸湡
@@ -200,7 +240,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 +290,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 "";
@@ -276,6 +331,15 @@
Dept dept = service.selectById(this.deptId);
if (!Cools.isEmpty(dept)){
return String.valueOf(dept.getName());
+ }
+ 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;
}
@@ -361,5 +425,8 @@
return null;
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1