From ea269db73631ff50e9d161f69b044b915cdac089 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 三月 2024 16:52:11 +0800
Subject: [PATCH] #周计划
---
src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java | 24 ++++++++++++++++++++----
1 files changed, 20 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..7d0b865 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,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.WeeklyCostTypesService;
import com.zy.crm.system.entity.*;
import com.zy.crm.system.service.*;
import org.springframework.format.annotation.DateTimeFormat;
@@ -74,13 +75,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;
@@ -175,7 +176,7 @@
@ApiModelProperty(value= "鍛ㄦ姤ID")
@TableId(value = "weekly_id", type = IdType.INPUT)
@TableField("weekly_id")
- private Integer weeklyId;
+ private Long weeklyId;
/**
* 鐢叉柟鍗曚綅ID
@@ -200,7 +201,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 +251,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 "";
--
Gitblit v1.9.1