From f337e00700b069f6d3229a9fef1fcd8623e9d69f Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 13:59:09 +0800
Subject: [PATCH] 提交档案导出
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 5673a0e..177c543 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
@@ -101,6 +101,10 @@
@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 = "仲裁事由")
@@ -119,7 +123,8 @@
@FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
@TableField("arbitrationStatus")
private Integer arbitrationStatus = 0;
-
+ @TableField(exist = false)
+ private String arbitrationStatusName ;
@FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
@TableField("settleDate")
@JsonSerialize(using = DateSerializer.class)
--
Gitblit v1.8.0