From cc792d6da0b6e07bae73daecccb055595b513969 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 22:25:52 +0800
Subject: [PATCH] 提交
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 aaebe7a..6e106e9 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
@@ -53,7 +53,7 @@
@TableField("deptId")
private Long deptId = 0L;
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
@ExcelField(value = "护卫点(部门)")
private String deptName = "";
@@ -95,7 +95,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 = "";
@@ -270,8 +270,13 @@
@FieldInfo(name = "handbookStatus", type = "varchar", explain = "员工手册")
@TableField("handbookStatus")
- @ExcelField(value = "员工手册")
+ @ExcelField(value = "员工手册", writeConverterExp = "0=未发,1=已发")
private String handbookStatus = "";
+
+ @FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
+ @TableField(exist = false)
+ @ExcelField(value = "员工手册")
+ private String handbookStatusName = "";
@FieldInfo(name = "urgencyPhone", type = "varchar", explain = "紧急联系电话")
@TableField("urgencyPhone")
@@ -280,8 +285,13 @@
@FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证")
@TableField("empCardStatus")
- @ExcelField(value = "工作证")
+ @ExcelField(value = "工作证", writeConverterExp = "0=未发,1=已发")
private String empCardStatus = "";
+
+ @FieldInfo(name = "empCardStatusName", type = "varchar", explain = "工作证")
+ @TableField(exist = false)
+ @ExcelField(value = "工作证")
+ private String empCardStatusName = "";
@FieldInfo(name = "certificateList", type = "varchar", explain = "相关证件")
@TableField("certificateList")
@@ -289,21 +299,26 @@
@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
- @ExcelField(value = "相关证件")
+ @ExcelField(value = "相关证件", writeConverterExp = "1=高中毕业证,2=专科毕业证,3=本科毕业证")
private String certificateListName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
-
-
@FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
@TableField("dimissionType")
@ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
private String dimissionType;
+ @FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
+ @TableField("entryType")
+ private String entryType = "01";
+
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @TableField(exist = false)
+ private String entryTypeName = "正常入职";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -340,12 +355,15 @@
@TableField("remark")
private String remark = "";
+ @TableField("imagePath")
+ private String imagePath;
+
@TableField(exist = false)
private String ageStr = "";
-
+
@TableField(exist = false)
private String entryDateStr= "";
-
+
@TableField(exist = false)
private String dimissionDateStr= "";
@@ -392,6 +410,8 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applayDate;
+
+
@TableField(exist = false)
private String reason;
@TableField(exist = false)
--
Gitblit v1.8.0