From 767f47d580e180e2574d9fc4d5379813fd80e5ba Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 02:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index e9244da..bd8f6c1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.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_dimissionlog")
+@Excel("员工离职记录")
public class EmpDimissionLog implements Serializable {
@FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
@@ -46,6 +50,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "入职日期", writeConverter = TimeConverter.class)
private Date entryDate;
@FieldInfo(name = "dimissionDate", type = "date", explain = "离职日期")
@@ -53,22 +58,27 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "离职日期", writeConverter = TimeConverter.class)
private Date dimissionDate;
@FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
@TableField("dimissionType")
+ @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
private String dimissionType = "1";
@FieldInfo(name = "selfLeaveDay", type = "decimal", explain = "自离天数")
@TableField("selfLeaveDay")
+ @ExcelField(value = "自离天数")
private BigDecimal selfLeaveDay = BigDecimal.ZERO;
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -109,4 +119,31 @@
@FieldInfo(name = "entryDates", explain = "关闭档案人员入职日期")
@TableField(exist = false)
private String entryDates;
-}
\ No newline at end of file
+
+ @TableField(exist = false)
+ private String entryDateStr= "";
+
+ @TableField(exist = false)
+ private String dimissionDateStr= "";
+
+ @TableField(exist = false)
+ private String afterOperation= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "身份证号码")
+ private String certificateNumb= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "员工编号")
+ private String empNumb= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "新部门")
+ private String newDeptName= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "新岗位")
+ private String newJobName= "";
+
+
+}
--
Gitblit v1.8.0