From c97fe0e22ac0a2c38b0636f619d3bcf030870c0c Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 01 三月 2021 21:28:02 +0800
Subject: [PATCH] 提交bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 75cb6b0..a4538ca 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 = "";
@@ -272,6 +272,11 @@
@TableField("handbookStatus")
@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")
@@ -282,6 +287,11 @@
@TableField("empCardStatus")
@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")
@@ -338,6 +348,9 @@
@TableField("remark")
private String remark = "";
+ @TableField("imagePath")
+ private String imagePath;
+
@TableField(exist = false)
private String ageStr = "";
@@ -390,6 +403,8 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applayDate;
+
+
@TableField(exist = false)
private String reason;
@TableField(exist = false)
--
Gitblit v1.8.0