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/EmpBaseInfo.java | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index a2ceddd..aa12ff7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -1,26 +1,24 @@
package cc.mrbird.febs.server.hr.entity;
-import java.io.Serializable;
-import java.util.Date;
-
import cc.mrbird.febs.common.core.annotation.FieldInfo;
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.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
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.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;
import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
/**
* name:EmpBaseinfo
@@ -32,7 +30,7 @@
* @since JDK1.8
*/
@Data
-@TableName("t_emp_baseInfo")
+@TableName("t_emp_baseinfo")
@Excel("员工基本信息表")
public class EmpBaseInfo implements Serializable {
@@ -57,7 +55,7 @@
@TableField("deptName")
private String deptName = "";
- @NotBlank(message = "{required}")
+
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
@ExcelField(value = "编号")
@@ -431,7 +429,31 @@
@TableField("allDeptName")
private String allDeptName = "";
- // @FieldInfo(name = "dimissRemark", type = "varchar", explain = "离职备注")
- // @TableField("dimissRemark")
- // private String dimissRemark = "";
+ @FieldInfo(name = "annualLeave", type = "int", explain = "年假天数")
+ @TableField("annualLeave")
+ private Integer annualLeave = 0;
+
+ @FieldInfo(name = "probationDate", type = "date", explain = "转正日期")
+ @TableField("probationDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "转正日期", writeConverter = TimeConverter.class)
+ private Date probationDate;
+
+ @FieldInfo(name = "probationStatus", type = "varchar", explain = "转正状态：0-待转正，1-已转正，2-解聘，3-延期")
+ @TableField("probationStatus")
+ private String probationStatus = "";
+
+ @FieldInfo(name = "probationStatusName", type = "varchar", explain = "转正状态")
+ @TableField(exist = false)
+ private String probationStatusName = "";
+
+ @FieldInfo(name = "retirementReminded", type = "tinyint", explain = "是否已提醒退休。0-未提醒 1-已提醒")
+ @TableField("retirementReminded")
+ private Integer retirementReminded = 0;
+
+ @FieldInfo(name = "timeRange", type = "int", explain = "时间范围：0-当天 1-本周 2-本月 3-今年，默认2")
+ @TableField(exist = false)
+ private Integer timeRange;
}
--
Gitblit v1.8.0