From 67aafeb142cf9af2a5dbcd1d17a450f31e2751b3 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期日, 21 二月 2021 10:28:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index 548221e..1c0285c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -4,12 +4,15 @@
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;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+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;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_jobchange")
+@Excel("员工调岗记录")
public class EmpJobChange implements Serializable {
private static final long serialVersionUID = 4229887878987429956L;
@@ -41,26 +45,32 @@
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "oldDeptName", type = "varchar", explain = "原部门")
@TableField("oldDeptName")
+ @ExcelField(value = "原部门")
private String oldDeptName = "";
@FieldInfo(name = "oldJobName", type = "varchar", explain = "原岗位")
@TableField("oldJobName")
+ @ExcelField(value = "原岗位")
private String oldJobName = "";
@FieldInfo(name = "newDeptName", type = "varchar", explain = "新部门")
@TableField("newDeptName")
+ @ExcelField(value = "新部门")
private String newDeptName = "";
@FieldInfo(name = "newJobName", type = "varchar", explain = "新岗位")
@TableField("newJobName")
+ @ExcelField(value = "新岗位")
private String newJobName = "";
@FieldInfo(name = "changeType", type = "varchar", explain = "调岗类型")
@TableField("changeType")
+ @ExcelField(value = "调岗类型",writeConverterExp = "2=升职,3=调动")
private String changeType = "";
@FieldInfo(name = "changeDate", type = "date", explain = "调岗位日期")
@@ -68,10 +78,12 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "调岗位日期", writeConverter = TimeConverter.class)
private Date changeDate;
@FieldInfo(name = "changeReason", type = "varchar", explain = "调岗原因")
@TableField("changeReason")
+ @ExcelField(value = "调岗原因")
private String changeReason = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -128,4 +140,7 @@
@FieldInfo(name = "oldJobNames", explain = "调岗人员原岗位")
@TableField(exist = false)
private String oldJobNames;
+
+ @TableField(exist = false)
+ private String changeDateStr= "";
}
\ No newline at end of file
--
Gitblit v1.8.0