From a889a01cca175ba5888f38be8f1df90089e6bb70 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 11 三月 2026 19:27:38 +0800
Subject: [PATCH] feat(EmpBaseInfoController): 添加身份证到期员工导出功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 125 +++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 43 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 9e83cae..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 {
@@ -49,25 +47,24 @@
@ExcelField(value = "档案号")
private String archivesNumb = "";
- //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "护卫点(部门)")
private String deptName = "";
- @NotBlank(message = "{required}")
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@NotBlank(message = "{required}")
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@NotBlank(message = "{required}")
@@ -76,7 +73,7 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- //@FieldInfo(name = "sexName", type = "varchar", explain = "性别")
+ @FieldInfo(name = "sexName", type = "varchar", explain = "性别")
@TableField(exist = false)
private String sexName = "";
@@ -84,7 +81,7 @@
@TableField("jobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @FieldInfo(name = "jobName", type = "varchar", explain = "所属岗位")
@TableField("jobName")
@ExcelField(value = "岗位名称")
private String jobName = "";
@@ -95,7 +92,7 @@
@ExcelField(value = "员工类别", writeConverterExp = "1=正式工,2=临时工")
private String empType = "";
- //@FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别")
+ @FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别")
@TableField(exist = false)
private String empTypeName = "";
@@ -103,21 +100,21 @@
@TableField("certificateType")
private String certificateType = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
@FieldInfo(name = "nation", type = "varchar", explain = "民族")
@TableField("nation")
private String nation = "";
- //@FieldInfo(name = "nationName", type = "varchar", explain = "民族")
+ @FieldInfo(name = "nationName", type = "varchar", explain = "民族")
@TableField(exist = false)
@ExcelField(value = "民族")
private String nationName = "";
- @FieldInfo(name = "certificateValidity", type = "date", explain = "证件有效期")
+ @FieldInfo(name = "certificateValidity", type = "date", explain = "身份证有效期")
@TableField("certificateValidity")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@@ -129,7 +126,7 @@
@TableField("marriage")
private String marriage = "";
- //@FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
+ @FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
@TableField(exist = false)
@ExcelField(value = "婚姻状况")
private String marriageName = "";
@@ -156,7 +153,7 @@
@TableField("politics")
private String politics = "";
- //@FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
+ @FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
@TableField(exist = false)
@ExcelField(value = "政治面貌")
private String politicsName = "";
@@ -181,7 +178,7 @@
@TableField("education")
private String education = "";
- //@FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
+ @FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
@TableField(exist = false)
@ExcelField(value = "最高学历")
private String educationName = "";
@@ -189,13 +186,13 @@
@FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
@TableField("seniority")
@ExcelField(value = "入司工龄")
- private Integer seniority = 0;
+ private String seniority = "0年0月";
@FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
@TableField("nativePlace")
private String nativePlace = "";
- //@FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
+ @FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
@TableField(exist = false)
@ExcelField(value = "籍贯")
private String nativePlaceName = "";
@@ -234,7 +231,7 @@
@TableField("archivesStatus")
private String archivesStatus = "";
- //@FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
+ @FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
@TableField(exist = false)
@ExcelField(value = "档案情况")
private String archivesStatusName = "";
@@ -249,13 +246,13 @@
@ExcelField(value = "银行账号")
private String bankNumb = "";
- @FieldInfo(name = "InsuranceType", type = "varchar", explain = "保险类型")
+ @FieldInfo(name = "insuranceType", type = "varchar", explain = "保险类型")
@TableField("InsuranceType")
private String insuranceType = "";
- //@FieldInfo(name = "InsuranceTypeName", type = "varchar", explain = "保险类型")
+ @FieldInfo(name = "insuranceTypeName", type = "varchar", explain = "社保档位")
@TableField(exist = false)
- @ExcelField(value = "保险类型")
+ @ExcelField(value = "社保档位")
private String insuranceTypeName = "";
@FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
@@ -273,7 +270,7 @@
@ExcelField(value = "员工手册", writeConverterExp = "0=未发,1=已发")
private String handbookStatus = "";
- //@FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
+ @FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
@TableField(exist = false)
@ExcelField(value = "员工手册")
private String handbookStatusName = "";
@@ -283,12 +280,12 @@
@ExcelField(value = "紧急联系电话")
private String urgencyPhone = "";
- @FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证")
+ @FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证代码")
@TableField("empCardStatus")
@ExcelField(value = "工作证", writeConverterExp = "0=未发,1=已发")
private String empCardStatus = "";
- //@FieldInfo(name = "empCardStatusName", type = "varchar", explain = "工作证")
+ @FieldInfo(name = "empCardStatusName", type = "varchar", explain = "工作证")
@TableField(exist = false)
@ExcelField(value = "工作证")
private String empCardStatusName = "";
@@ -297,7 +294,7 @@
@TableField("certificateList")
private String certificateList = "";
- //@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
+ @FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
@ExcelField(value = "相关证件", writeConverterExp = "1=高中毕业证,2=专科毕业证,3=本科毕业证")
private String certificateListName = "";
@@ -314,11 +311,11 @@
@FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
@TableField("entryType")
- private String entryType = "01";
+ private String entryType;
- //@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
- private String entryTypeName = "正常入职";
+ private String entryTypeName = "新入职";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -348,7 +345,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
@@ -367,6 +364,7 @@
@TableField(exist = false)
private String dimissionDateStr= "";
+ @FieldInfo(name = "dimissionTypeName", type = "varchar", explain = "离职类型")
@TableField(exist = false)
private String dimissionTypeName= "";
@@ -388,9 +386,9 @@
@TableField(exist = false)
private String contractStatus = "";
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
@TableField(exist = false)
- private Integer contractPeriod = 0;
+ private String contractPeriod;
@FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
@TableField(exist = false)
@@ -410,11 +408,52 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applayDate;
-
-
@TableField(exist = false)
private String reason;
@TableField(exist = false)
private String reporter;
+ @FieldInfo(name = "baseKey", type = "varchar", explain = "查询关键词")
+ @TableField(exist = false)
+ private String baseKey;
+
+ @FieldInfo(name = "empStatusName", type = "varchar", explain = "员工状态")
+ @TableField(exist = false)
+ private String empStatusName = "";
+
+ @TableField(exist = false)
+ private String inOutType;
+
+ @FieldInfo(name = "allDeptName", type = "varchar", explain = "护卫点(部门)")
+ @ExcelField(value = "护卫点(部门)")
+ @TableField("allDeptName")
+ private String allDeptName = "";
+
+ @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