From 0f8c4b7528e2b168c35a3ecbe366cf36730914b7 Mon Sep 17 00:00:00 2001
From: [1124498879] <[kongxf@daryun.com]>
Date: 星期一, 31 五月 2021 11:24:49 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 eefeaa1..1df8c06 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
@@ -188,7 +188,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")
@@ -296,7 +296,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 = "";
@@ -315,7 +315,7 @@
@TableField("entryType")
private String entryType = "";
- //@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
private String entryTypeName = "新入职";
@@ -347,7 +347,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
@@ -366,6 +366,7 @@
@TableField(exist = false)
private String dimissionDateStr= "";
+ @FieldInfo(name = "dimissionTypeName", type = "varchar", explain = "离职类型")
@TableField(exist = false)
private String dimissionTypeName= "";
@@ -429,4 +430,8 @@
@ExcelField(value = "护卫点(部门)")
@TableField("allDeptName")
private String allDeptName = "";
+
+ // @FieldInfo(name = "dimissRemark", type = "varchar", explain = "离职备注")
+ // @TableField("dimissRemark")
+ // private String dimissRemark = "";
}
--
Gitblit v1.8.0