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/EmpContractInfo.java | 121 ++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 53 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 550ffee..9767438 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -1,24 +1,23 @@
package cc.mrbird.febs.server.hr.entity;
-import java.io.Serializable;
-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.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
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;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* name:EmpContractinfo
@@ -43,38 +42,75 @@
@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 = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
+ @TableField("certificateNumb")
+ @ExcelField(value = "身份证号码")
+ private String certificateNumb = "";
+
+ @FieldInfo(name = "signingDate", type = "date", explain = "签订日期")
+ @TableField("signingDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "合同签订日期", writeConverter = TimeConverter.class)
+ private Date signingDate;
+
+ @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+ @TableField("endDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
+ private Date endDate;
+
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限（年）")
+ @TableField("contractPeriod")
+ @ExcelField(value = "合同期限(年)")
+ private String contractPeriod;
+
+ @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
+ @TableField(exist = false)
+ @ExcelField(value = "合同状态")
+ private String contractStatusName = "";
+
+ @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
+ @TableField("transactor")
+ @ExcelField(value = "合同办理人")
+ private String transactor = "";
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
- @TableField("certificateNumb")
- @ExcelField(value = "证件号码")
- private String certificateNumb = "";
-
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+// @TableField("sex")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
@TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
////@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -83,7 +119,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+// @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@@ -91,39 +127,12 @@
@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 beginDate;
-
- @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
- @TableField("endDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
- private Date endDate;
@FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
@TableField("contractStatus")
- @ExcelField(value = "合同状态", writeConverterExp = "1=有效,2=到期,3=续签,4=存档")
private String contractStatus = "";
-
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
- @TableField("contractPeriod")
- @ExcelField(value = "合同期限(年)")
- private Integer contractPeriod = 0;
-
- @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
- @TableField("transactor")
- @ExcelField(value = "合同办理人")
- private String transactor = "";
-
- @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
- @TableField("signingDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "合同签订日期", writeConverter = TimeConverter.class)
- private Date signingDate;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
@@ -158,8 +167,15 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
+
+ @FieldInfo(name = "diffDay", type = "varchar", explain = "距到期天数")
+ @TableField("diffDay")
+ private Integer diffDay = 0;
+
+ @TableField("remindFlag")
+ private Integer remindFlag = 0;
@TableField(exist = false)
private String signingDateStr = "";
@@ -167,8 +183,7 @@
@TableField(exist = false)
private String endDateStr = "";
- @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
@TableField(exist = false)
- private String contractStatusName = "";
-
+ @FieldInfo(name = "diffLabel", type = "varchar", explain = "到期提醒")
+ private String diffLabel = "";
}
--
Gitblit v1.8.0