From ae60ad1dd19a86dd9723b199111bc3e2fb45f126 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 03 四月 2026 20:58:59 +0800
Subject: [PATCH] refactor(hr): 移除保险提醒相关冗余代码并调整退休延迟计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java | 185 ++++++++++++++++++++++++++++++---------------
1 files changed, 122 insertions(+), 63 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
index 9942781..736953a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
@@ -1,84 +1,143 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.DateConverter;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpRemarkinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工备注信息数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:15
-* @since JDK1.8
-*/
+ * name:EmpRemarkinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工备注信息数据表映射实体
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:48
+ * @since JDK1.8
+ */
@Data
@TableName("t_emp_remarkinfo")
-public class EmpRemarkInfo {
+@Excel("员工备注信息")
+public class EmpRemarkInfo implements Serializable {
- /**
- * 备注Id
- */
- @TableId(value = "remarkId", type = IdType.AUTO)
- private Long remarkId;
+ private static final long serialVersionUID = 3084540653935731579L;
+ //@FieldInfo(name = "remarkId", type = "bigint", explain = "备注Id")
+ @TableId(value = "remarkId")
+ private Long remarkId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 备注内容
- */
- @TableField("remarkContent")
- private String remarkContent;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
+ @TableField("empNumb")
+ @ExcelField(value = "编号")
+ private String empNumb = "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @ExcelField(value = "岗位")
+ private String jobName = "";
- /**
- * 备注日期
- */
- @TableField("remarkDate")
- private Date remarkDate;
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
+ @TableField("empName")
+ @ExcelField(value = "姓名")
+ private String empName = "";
+
+ @FieldInfo(name = "remarkDate", type = "date", explain = "备注日期")
+ @TableField("remarkDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "备注日期", writeConverter = DateConverter.class)
+ private Date remarkDate;
+
+ @FieldInfo(name = "remarkContent", type = "varchar", explain = "备注内容")
+ @TableField("remarkContent")
+ @ExcelField(value = "备注内容")
+ private String remarkContent = "";
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别")
+ @TableField("sex")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex = "";
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
+ @TableField("certificateNumb")
+// @ExcelField(value = "身份证号码")
+ private String certificateNumb = "";
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+
-}
\ No newline at end of file
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ // @Version
+ private Integer version = 0;
+
+ @TableField(exist = false)
+ private String remarkDateStr= "";
+
+ @TableField(exist = false)
+ private String empStatus;
+
+
+}
--
Gitblit v1.8.0