From f251a1e9a6577113030897223065f385bdf650c2 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期四, 25 二月 2021 18:57:44 +0800
Subject: [PATCH] 修改bug

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java |   19 +++++++++----------
 1 files changed, 9 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 5f7ee44..2b403f9 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
@@ -270,7 +270,7 @@
 
     @FieldInfo(name = "handbookStatus", type = "varchar", explain = "员工手册")
     @TableField("handbookStatus")
-    @ExcelField(value = "员工手册")
+    @ExcelField(value = "员工手册", writeConverterExp = "0=未发,1=已发")
     private String handbookStatus = "";
 
     @FieldInfo(name = "urgencyPhone", type = "varchar", explain = "紧急联系电话")
@@ -280,7 +280,7 @@
 
     @FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证")
     @TableField("empCardStatus")
-    @ExcelField(value = "工作证")
+    @ExcelField(value = "工作证", writeConverterExp = "0=未发,1=已发")
     private String empCardStatus = "";
 
     @FieldInfo(name = "certificateList", type = "varchar", explain = "相关证件")
@@ -289,15 +289,13 @@
 
     @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")
@@ -339,6 +337,9 @@
     @FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
     @TableField("remark")
     private String remark = "";
+
+    @TableField("imagePath")
+    private String imagePath;
 
 	@TableField(exist = false)
 	private String ageStr = "";
@@ -392,13 +393,11 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date applayDate;
 
+
+
     @TableField(exist = false)
     private String reason;
     @TableField(exist = false)
     private String reporter;
 
-    @FieldInfo(name = "imagePath", type = "varchar", explain = "图片路径")
-    @TableField("imagePath")
-    private String imagePath = "";
-
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0