From 28187d584b00856bb1961b7ce6ebd168ef1aded7 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期四, 13 五月 2021 18:11:17 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 85 ++++++++++++++++++++++++++----------------
1 files changed, 53 insertions(+), 32 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 8033deb..79c56c7 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,76 +35,90 @@
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;
+
+ @ExcelField(value = "员工编号")
+ @TableField(exist = false)
+ private String empNumb="";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @TableField(exist = false)
+ @ExcelField(value = "现部门(护卫点)")
+ private String allDeptName = "";
+
+ @FieldInfo(name = "newDeptName", type = "varchar", explain = "新部门")
+ @TableField("newDeptName")
+ private String newDeptName = "";
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "newJobName", type = "varchar", explain = "新岗位")
+ @TableField("newJobName")
+ @ExcelField(value = "现岗位")
+ private String newJobName = "";
+
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "oldDeptName", type = "varchar", explain = "原部门")
@TableField("oldDeptName")
- @ExcelField(value = "原部门")
+ @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 = "调岗位日期")
@TableField("changeDate")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "调岗位日期", writeConverter = TimeConverter.class)
+ @ExcelField(value = "调岗日期", writeConverter = TimeConverter.class)
private Date changeDate;
+ @FieldInfo(name = "changeTypeName", type = "varchar", explain = "调岗类型")
+ @TableField(exist = false)
+ @ExcelField(value = "调岗类型")
+ private String changeTypeName = "";
+
@FieldInfo(name = "changeReason", type = "varchar", explain = "调岗原因")
@TableField("changeReason")
- @ExcelField(value = "调岗原因")
+ @ExcelField(value = "调岗理由描述")
private String changeReason = "";
+
+ @FieldInfo(name = "changeType", type = "varchar", explain = "调岗类型")
+ @TableField("changeType")
+ // @ExcelField(value = "调岗类型",writeConverterExp = "2=升职,3=调动")
+ private String changeType = "";
- @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,9 +126,9 @@
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@FieldInfo(name = "jobId", explain = "现岗位Id")
@@ -147,10 +161,17 @@
@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;
+
+
+
+
+
}
--
Gitblit v1.8.0