From ce353609f8682efaa4a4e6f62957f01ef5ef005b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 01 四月 2021 22:32:37 +0800
Subject: [PATCH] 附件查询部门修改为部门全称
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 2cfefef..e96d2fb 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
@@ -44,6 +44,23 @@
//@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
+
+ @TableField(exist = false)
+ @ExcelField(value = "员工编号")
+ private String empNumb= "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @TableField(exist = false)
+ @ExcelField(value = "部门(护卫点)")
+ private String allDeptName = "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "岗位")
+ private String newJobName= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "姓名")
+ private String empName = "";
@FieldInfo(name = "entryDate", type = "date", explain = "入职日期")
@TableField("entryDate")
@@ -60,26 +77,30 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "离职日期", writeConverter = TimeConverter.class)
private Date dimissionDate;
-
- @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
- @TableField("dimissionType")
- @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
- private String dimissionType = "1";
-
+
@FieldInfo(name = "selfLeaveDay", type = "decimal", explain = "自离天数")
@TableField("selfLeaveDay")
@ExcelField(value = "自离天数")
private BigDecimal selfLeaveDay = BigDecimal.ZERO;
-
+
+
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
- @ExcelField(value = "报备人")
+ @ExcelField(value = "报告人")
private String reporter = "";
-
+
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
@ExcelField(value = "备注")
private String remark = "";
+
+ @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+// @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
+ private String dimissionType = "1";
+
+
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -130,22 +151,19 @@
private String afterOperation= "";
@TableField(exist = false)
- @ExcelField(value = "身份证号码")
+// @ExcelField(value = "身份证号码")
private String certificateNumb= "";
- @TableField(exist = false)
- @ExcelField(value = "员工编号")
- private String empNumb= "";
+
@TableField(exist = false)
- @ExcelField(value = "新部门")
+// @ExcelField(value = "新部门")
private String newDeptName= "";
- @TableField(exist = false)
- @ExcelField(value = "新岗位")
- private String newJobName= "";
+
@TableField(exist = false)
private String empStatus;
+
}
--
Gitblit v1.8.0