From 7b7b63de881e04a8197bfa3d145f797167eb8e3c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 01:15:10 +0800
Subject: [PATCH] fix(bug修复): 部门全称
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 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 1c0285c..e3cb16f 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
@@ -35,15 +35,15 @@
public class EmpJobChange implements Serializable {
private static final long serialVersionUID = 4229887878987429956L;
- @FieldInfo(name = "jobChangeId", type = "bigint", explain = "岗位调整Id")
+ //@FieldInfo(name = "jobChangeId", type = "bigint", explain = "岗位调整Id")
@TableId(value = "jobChangeId")
private Long jobChangeId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
@@ -86,25 +86,25 @@
@ExcelField(value = "调岗原因")
private String changeReason = "";
- @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 = "";
@@ -112,7 +112,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;
@@ -140,7 +140,25 @@
@FieldInfo(name = "oldJobNames", explain = "调岗人员原岗位")
@TableField(exist = false)
private String oldJobNames;
-
+
@TableField(exist = false)
private String changeDateStr= "";
-}
\ No newline at end of file
+
+ @TableField(exist = false)
+ private String deptName= "";
+
+ @ExcelField(value = "员工编号")
+ @TableField(exist = false)
+ private String empNumb="";
+
+ @ExcelField(value = "身份证号码")
+ @TableField(exist = false)
+ private String certificateNumb="";
+
+ @TableField(exist = false)
+ private String empStatus;
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+}
--
Gitblit v1.8.0