From 09c6b3b6fc4ee6b1bc9fa1a6d3da3044729fc95a Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 31 三月 2026 18:50:18 +0800
Subject: [PATCH] fix(hr): 修正年假计算逻辑及代码格式问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 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 2f6e660..bcc7a00 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
@@ -37,13 +37,34 @@
@Excel("员工离职记录")
public class EmpDimissionLog implements Serializable {
- @FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
+ //@FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
@TableId(value = "closeId")
private Long closeId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@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("deptName")
+ @ExcelField(value = "部门/护卫点")
+ private String deptName;
+
+ @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,46 +81,47 @@
@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 = "createTime", type = "datetime", explain = "记录创建时间")
+ @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+// @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
+ private String dimissionType;
+
+ //@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 = "";
@@ -107,22 +129,26 @@
@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 = "empIds", explain = "关闭档案人员Id")
@TableField(exist = false)
private String empIds;
+ @FieldInfo(name = "deptNames", explain = "关闭档案人员部门名称")
+ @TableField(exist = false)
+ private String deptNames;
+
@FieldInfo(name = "entryDates", explain = "关闭档案人员入职日期")
@TableField(exist = false)
private String entryDates;
-
+
@TableField(exist = false)
private String entryDateStr= "";
-
+
@TableField(exist = false)
private String dimissionDateStr= "";
@@ -130,5 +156,19 @@
private String afterOperation= "";
@TableField(exist = false)
+// @ExcelField(value = "身份证号码")
private String certificateNumb= "";
-}
\ No newline at end of file
+
+
+
+ @TableField(exist = false)
+// @ExcelField(value = "新部门")
+ private String newDeptName= "";
+
+
+
+ @TableField(exist = false)
+ private String empStatus;
+
+
+}
--
Gitblit v1.8.0