From c540c6c77b9f11bcf8b1688bb08ebaed7df12006 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:36:41 +0800
Subject: [PATCH] 修改导入bug

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java |   93 +++++++++++++++++++++++++---------------------
 1 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
index e732339..8144fbb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
@@ -46,21 +46,63 @@
     @TableField("empNumb")
     @ExcelField(value = "编号")
     private String empNumb = "";
+    
+    @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+    @ExcelField(value = "部门(护卫点)")
+    @TableField(exist = false)
+    private String allDeptName = "";
+    
+    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+    @TableField("jobName")
+    @ExcelField(value = "岗位")
+    private String jobName = "";
 
     @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
     @TableField("empName")
     @ExcelField(value = "姓名")
     private String empName = "";
-
-    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
-    @TableField("sex")
-    @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
-    private String sex = "";
-
+    
     @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
     @TableField("certificateNumb")
     @ExcelField(value = "身份证号码")
     private String certificateNumb = "";
+    
+    @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
+    @TableField("applayDate")
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelField(value = "失业金申请日期", writeConverter = TimeConverter.class)
+    private Date applayDate;
+    
+    @FieldInfo(name = "applayReason", type = "varchar", explain = "申报事由")
+    @TableField("applayReason")
+    @ExcelField(value = "申报事由")
+    private String applayReason = "";
+    
+    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+    @TableField("reporter")
+    @ExcelField(value = "汇报人")
+    private String reporter = "";
+
+    @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
+    @TableField("auditor")
+    @ExcelField(value = "审核人")
+    private String auditor = "";
+
+    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+    @TableField("remark")
+    @ExcelField(value = "备注")
+    private String remark = "";
+    
+    
+
+    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+    @TableField("sex")
+//    @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+    private String sex = "";
+
+    
 
     //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
     @TableField("deptId")
@@ -74,39 +116,7 @@
     @TableField("JobId")
     private Long jobId = 0L;
 
-    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
-    @TableField("jobName")
-    @ExcelField(value = "岗位名称")
-    private String jobName = "";
-
-    @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
-    @TableField("applayDate")
-    @JsonSerialize(using = DateSerializer.class)
-    @JsonDeserialize(using = DateDeSerializer.class)
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
-    private Date applayDate;
-
-    @FieldInfo(name = "applayReason", type = "varchar", explain = "申报事由")
-    @TableField("applayReason")
-    @ExcelField(value = "申报事由")
-    private String applayReason = "";
-
-    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
-    @TableField("reporter")
-    @ExcelField(value = "报备人")
-    private String reporter = "";
-
-    @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
-    @TableField("auditor")
-    @ExcelField(value = "审核人")
-    private String auditor = "";
-
-    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
-    @TableField("remark")
-    @ExcelField(value = "备注")
-    private String remark = "";
-
+   
 
     //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
     @TableField("createTime")
@@ -145,8 +155,5 @@
     @TableField(exist = false)
     private String empStatus;
 
-    @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
-    @ExcelField(value = "部门(护卫点)")
-    @TableField(exist = false)
-    private String allDeptName = "";
+   
 }

--
Gitblit v1.8.0