From 3f50415850d93bf58306583086bf5400e18aeee0 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 10 三月 2021 07:59:05 +0800
Subject: [PATCH] fix(bug修复): 岗位管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 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 092d4fa..10e8c24 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,39 +31,46 @@
*/
@Data
@TableName("t_emp_jobchange")
+@Excel("员工调岗记录")
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 = "员工姓名")
@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,31 +78,33 @@
@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 = "记录创建时间")
+ //@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 = "";
@@ -100,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;
@@ -128,7 +140,21 @@
@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;
+}
--
Gitblit v1.8.0