From bfd4ded5aaf7fcead591435d504bea9105d2fd2e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 12 五月 2021 12:40:31 +0800
Subject: [PATCH] fix(bug修复): 用户部门显示allDeptName
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 127 ++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 59 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 2d7e38d..9fa771f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -46,49 +46,26 @@
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
-
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
- @TableField("empName")
- @ExcelField(value = "员工姓名")
- private String empName = "";
-
- @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
- @TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
- private String empStatus = "";
-
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
- private String sex = "";
-
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
- @TableField("certificateNumb")
- @ExcelField(value = "证件号码")
- private String certificateNumb = "";
-
- //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
- @TableField("deptId")
- private Long deptId = 0L;
-
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField("deptName")
- @ExcelField(value = "部门名称")
- private String deptName = "";
-
- //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
- @TableField("JobId")
- private Long jobId = 0L;
-
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+ @ExcelField(value = "岗位")
private String jobName = "";
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
+ @TableField("empName")
+ @ExcelField(value = "姓名")
+ private String empName = "";
+
@FieldInfo(name = "beginTime", type = "datetime", explain = "开始时间")
@TableField("beginTime")
@JsonSerialize(using = DateTimeSerializer.class)
@@ -104,34 +81,68 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelField(value = "结束时间", writeConverter = TimeConverter.class)
private Date endTime;
-
- @FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
- @TableField("leaveType")
- @ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
- private String leaveType = "";
-
- @FieldInfo(name = "leaveTypeName", type = "varchar", explain = "请假类型")
- @TableField(exist = false)
- private String leaveTypeName = "";
-
-
+
@FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
@TableField("leaveDay")
@ExcelField(value = "请假天数")
private BigDecimal leaveDay = BigDecimal.ZERO;
-
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
+
+ @FieldInfo(name = "leaveTypeName", type = "varchar", explain = "请假类型")
+ @TableField(exist = false)
+ @ExcelField(value = "请假类型")
+ private String leaveTypeName = "";
+
@FieldInfo(name = "returnDate", type = "date", explain = "到岗时间")
@TableField("returnDate")
@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 returnDate;
+
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ @ExcelField(value = "报备人")
+ private String reporter = "";
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+ private String empStatus = "";
+
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex = "";
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
+ @TableField("certificateNumb")
+// @ExcelField(value = "身份证号码")
+ private String certificateNumb = "";
+
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
+
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
+ @TableField("deptName")
+ private String deptName = "";
+
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+
+ @FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
+ @TableField("leaveType")
+// @ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
+ private String leaveType = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -161,14 +172,12 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
@TableField(exist = false)
private String leaveDateStr= "";
+
}
--
Gitblit v1.8.0