From ffab76344576bdd096fbe1b0c9fb31bd110c41ca Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 09 三月 2021 01:05:50 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 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 2f6e660..2cfefef 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
@@ -37,11 +37,11 @@
@Excel("员工离职记录")
public class EmpDimissionLog implements Serializable {
- @FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
+ //@FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
@TableId(value = "closeId")
private Long closeId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -81,25 +81,25 @@
@ExcelField(value = "备注")
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
@@ -107,7 +107,7 @@
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -119,10 +119,10 @@
@FieldInfo(name = "entryDates", explain = "关闭档案人员入职日期")
@TableField(exist = false)
private String entryDates;
-
+
@TableField(exist = false)
private String entryDateStr= "";
-
+
@TableField(exist = false)
private String dimissionDateStr= "";
@@ -130,5 +130,22 @@
private String afterOperation= "";
@TableField(exist = false)
+ @ExcelField(value = "身份证号码")
private String certificateNumb= "";
-}
\ No newline at end of file
+
+ @TableField(exist = false)
+ @ExcelField(value = "员工编号")
+ private String empNumb= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "新部门")
+ private String newDeptName= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "新岗位")
+ private String newJobName= "";
+
+ @TableField(exist = false)
+ private String empStatus;
+
+}
--
Gitblit v1.8.0