From f4151abee349597ed58a405a8a5e48a5d1a1f7a6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 02 六月 2024 19:06:39 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 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 24cfeec..a6a89a1 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,6 +1,7 @@
package cc.mrbird.febs.server.hr.entity;
import java.io.Serializable;
+import java.time.LocalDate;
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
@@ -49,25 +50,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}")
@@ -103,9 +103,9 @@
@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 = "民族")
@@ -117,7 +117,7 @@
@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)
@@ -181,7 +181,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,7 +189,7 @@
@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")
@@ -253,9 +253,9 @@
@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 = "社保电脑号")
@@ -297,7 +297,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,9 +314,9 @@
@FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
@TableField("entryType")
- private String entryType = "";
+ private String entryType;
- //@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
private String entryTypeName = "新入职";
@@ -348,7 +348,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
@@ -367,6 +367,7 @@
@TableField(exist = false)
private String dimissionDateStr= "";
+ @FieldInfo(name = "dimissionTypeName", type = "varchar", explain = "离职类型")
@TableField(exist = false)
private String dimissionTypeName= "";
@@ -388,9 +389,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)
@@ -422,4 +423,16 @@
@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 = "dimissRemark", type = "varchar", explain = "离职备注")
+ // @TableField("dimissRemark")
+ // private String dimissRemark = "";
}
--
Gitblit v1.8.0