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/EmpLaborTrouble.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
index 5f59318..4dd81e0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
@@ -4,6 +4,7 @@
 import java.util.Date;
 
 import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
 import cc.mrbird.febs.common.core.utils.DateDeSerializer;
 import cc.mrbird.febs.common.core.utils.DateSerializer;
 import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
 
 import java.math.BigDecimal;
 
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +34,7 @@
  */
 @Data
 @TableName("t_emp_labortrouble")
+@Excel("员工劳资案件")
 public class EmpLaborTrouble implements Serializable {
 
     private static final long serialVersionUID = -7587978188799851715L;
@@ -44,14 +48,17 @@
 
     @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
     @TableField("empNumb")
+    @ExcelField(value = "员工编号")
     private String empNumb = "";
 
     @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
     @TableField("empName")
+    @ExcelField(value = "员工姓名")
     private String empName = "";
     
     @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
     @TableField("empStatus")
+    @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
     private String empStatus = "";
 
     @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -60,6 +67,7 @@
 
     @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
     @TableField("certificateNumb")
+    @ExcelField(value = "证件号码")
     private String certificateNumb = "";
 
     @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,6 +76,7 @@
 
     @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
     @TableField("deptName")
+    @ExcelField(value = "部门名称")
     private String deptName = "";
 
     @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,6 +85,7 @@
 
     @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
     @TableField("jobName")
+    @ExcelField(value = "岗位名称")
     private String jobName = "";
 
     @FieldInfo(name = "arbitrationDate", type = "date", explain = "仲裁日期")
@@ -83,22 +93,31 @@
     @JsonSerialize(using = DateSerializer.class)
     @JsonDeserialize(using = DateDeSerializer.class)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelField(value = "仲裁日期", writeConverter = TimeConverter.class)
     private Date arbitrationDate;
 
     @FieldInfo(name = "arbitrationType", type = "varchar", explain = "仲裁类型")
     @TableField("arbitrationType")
+    @ExcelField(value = "仲裁类型", writeConverterExp = "01=未报告,02=民事纠纷,03=合同纠纷")
     private String arbitrationType = "";
+
+    @FieldInfo(name = "arbitrationTypeName", type = "varchar", explain = "仲裁类型")
+    @TableField(exist = false)
+    private String arbitrationTypeName = "";
 
     @FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
     @TableField("arbitrationReason")
+    @ExcelField(value = "仲裁事由")
     private String arbitrationReason = "";
 
     @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
     @TableField("reporter")
+    @ExcelField(value = "报备人")
     private String reporter = "";
 
     @FieldInfo(name = "arbitrationPay", type = "decimal", explain = "仲裁赔付(元)")
     @TableField("arbitrationPay")
+    @ExcelField(value = "仲裁赔付(元)")
     private BigDecimal arbitrationPay = BigDecimal.ZERO;
 
     @FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
@@ -110,6 +129,7 @@
     @JsonSerialize(using = DateSerializer.class)
     @JsonDeserialize(using = DateDeSerializer.class)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
     private Date settleDate;
 
     @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")

--
Gitblit v1.8.0