员工关怀增加执行时间

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffCareEntity.java

 package com.mortals.xhx.module.staff.model;
-
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.vo.StaffCareVo;
+import lombok.Data;
 /**
-* 员工关怀信息实体对象
-*
-* @author zxfei
-* @date 2023-04-07
-*/
-
+ * 员工关怀信息实体对象
+ *
+ * @author zxfei
+ * @date 2025-04-10
+ */
+@Data
 public class StaffCareEntity extends StaffCareVo {
     private static final long serialVersionUID = 1L;
 
@@ -61,168 +64,10 @@ public class StaffCareEntity extends StaffCareVo {
      * 关怀内容
      */
     private String content;
-
-
-
-    public StaffCareEntity(){}
-    /**
-    * 获取 员工ID
-    * @return Long
-    */
-    public Long getStaffId(){
-        return staffId;
-    }
-    /**
-    * 设置 员工ID
-    * @param staffId
-    */
-    public void setStaffId(Long staffId){
-        this.staffId = staffId;
-    }
-    /**
-    * 获取 员工姓名
-    * @return String
-    */
-    public String getStaffName(){
-        return staffName;
-    }
-    /**
-    * 设置 员工姓名
-    * @param staffName
-    */
-    public void setStaffName(String staffName){
-        this.staffName = staffName;
-    }
-    /**
-    * 获取 出生日期
-    * @return Date
-    */
-    public Date getBirthday(){
-        return birthday;
-    }
-    /**
-    * 设置 出生日期
-    * @param birthday
-    */
-    public void setBirthday(Date birthday){
-        this.birthday = birthday;
-    }
-    /**
-    * 获取 所属部门
-    * @return Long
-    */
-    public Long getDeptId(){
-        return deptId;
-    }
-    /**
-    * 设置 所属部门
-    * @param deptId
-    */
-    public void setDeptId(Long deptId){
-        this.deptId = deptId;
-    }
-    /**
-    * 获取 所属部门名称
-    * @return String
-    */
-    public String getDeptName(){
-        return deptName;
-    }
-    /**
-    * 设置 所属部门名称
-    * @param deptName
-    */
-    public void setDeptName(String deptName){
-        this.deptName = deptName;
-    }
-    /**
-    * 获取 职位ID
-    * @return Long
-    */
-    public Long getJobId(){
-        return jobId;
-    }
-    /**
-    * 设置 职位ID
-    * @param jobId
-    */
-    public void setJobId(Long jobId){
-        this.jobId = jobId;
-    }
-    /**
-    * 获取 职位名称
-    * @return String
-    */
-    public String getJobName(){
-        return jobName;
-    }
-    /**
-    * 设置 职位名称
-    * @param jobName
-    */
-    public void setJobName(String jobName){
-        this.jobName = jobName;
-    }
-    /**
-    * 获取 入职时间
-    * @return Date
-    */
-    public Date getEntryDate(){
-        return entryDate;
-    }
-    /**
-    * 设置 入职时间
-    * @param entryDate
-    */
-    public void setEntryDate(Date entryDate){
-        this.entryDate = entryDate;
-    }
-    /**
-    * 获取 关怀类型(1.生日关怀,2.入职周年关怀)
-    * @return Integer
-    */
-    public Integer getCareType(){
-        return careType;
-    }
-    /**
-    * 设置 关怀类型(1.生日关怀,2.入职周年关怀)
-    * @param careType
-    */
-    public void setCareType(Integer careType){
-        this.careType = careType;
-    }
-    /**
-    * 获取 发送状态(0.未发送,1.已发送)
-    * @return Integer
-    */
-    public Integer getSendStatus(){
-        return sendStatus;
-    }
-    /**
-    * 设置 发送状态(0.未发送,1.已发送)
-    * @param sendStatus
-    */
-    public void setSendStatus(Integer sendStatus){
-        this.sendStatus = sendStatus;
-    }
-    /**
-    * 获取 关怀内容
-    * @return String
-    */
-    public String getContent(){
-        return content;
-    }
     /**
-    * 设置 关怀内容
-    * @param content
+     * 执行时间
      */
-    public void setContent(String content){
-        this.content = content;
-    }
-
-
-
-
+    private Date excuteTime;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -239,44 +84,18 @@ public class StaffCareEntity extends StaffCareVo {
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",staffId:").append(getStaffId());
-        sb.append(",staffName:").append(getStaffName());
-        sb.append(",birthday:").append(getBirthday());
-        sb.append(",deptId:").append(getDeptId());
-        sb.append(",deptName:").append(getDeptName());
-        sb.append(",jobId:").append(getJobId());
-        sb.append(",jobName:").append(getJobName());
-        sb.append(",entryDate:").append(getEntryDate());
-        sb.append(",careType:").append(getCareType());
-        sb.append(",sendStatus:").append(getSendStatus());
-        sb.append(",content:").append(getContent());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
-
         this.staffId = null;
-
         this.staffName = "";
-
         this.birthday = null;
-
         this.deptId = null;
-
         this.deptName = "";
-
         this.jobId = null;
-
         this.jobName = "";
-
         this.entryDate = null;
-
         this.careType = 1;
-
         this.sendStatus = 0;
-
         this.content = "";
+        this.excuteTime = null;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffCareQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.staff.model.StaffCareEntity;
 /**
-* 员工关怀信息查询对象
-*
-* @author zxfei
-* @date 2023-04-07
-*/
+ * 员工关怀信息查询对象
+ *
+ * @author zxfei
+ * @date 2025-04-10
+ */
 public class StaffCareQuery extends StaffCareEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -174,6 +174,12 @@ public class StaffCareQuery extends StaffCareEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 执行时间 */
+    private String excuteTimeStart;
+
+    /** 结束 执行时间 */
+    private String excuteTimeEnd;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<StaffCareQuery> orConditionList;
 
@@ -1086,6 +1092,38 @@ public class StaffCareQuery extends StaffCareEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 执行时间
+     * @return excuteTimeStart
+     */
+    public String getExcuteTimeStart(){
+        return this.excuteTimeStart;
+    }
+
+    /**
+     * 设置 开始 执行时间
+     * @param excuteTimeStart
+     */
+    public void setExcuteTimeStart(String excuteTimeStart){
+        this.excuteTimeStart = excuteTimeStart;
+    }
+
+    /**
+     * 获取 结束 执行时间
+     * @return excuteTimeEnd
+     */
+    public String getExcuteTimeEnd(){
+        return this.excuteTimeEnd;
+    }
+
+    /**
+     * 设置 结束 执行时间
+     * @param excuteTimeEnd
+     */
+    public void setExcuteTimeEnd(String excuteTimeEnd){
+        this.excuteTimeEnd = excuteTimeEnd;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1598,6 +1636,7 @@ public class StaffCareQuery extends StaffCareEntity {
     }
 
 
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

db/add.sql

@@ -1389,7 +1389,7 @@ ALTER TABLE mortals_xhx_staff ADD COLUMN  `dingUserId` varchar(128)  COMMENT '
 -- ----------------------------
 ALTER TABLE `mortals_xhx_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2)    DEFAULT '0'  COMMENT '时间类型(0,按月,1按季度,2按年)';
 ALTER TABLE `mortals_xhx_check_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2)    DEFAULT '0'  COMMENT '时间类型(0,按月,1按季度,2按年)';
-
+ALTER TABLE `mortals_xhx_staff_care` ADD COLUMN `excuteTime` datetime DEFAULT NULL COMMENT '执行时间';
 -- ----------------------------
 -- 考勤机管理表
 -- ----------------------------