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 | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 76a9b32..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
@@ -63,7 +62,7 @@
@ExcelField(value = "身份证号码")
private String certificateNumb = "";
- @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
+ @FieldInfo(name = "signingDate", type = "date", explain = "签订日期")
@TableField("signingDate")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@@ -79,10 +78,10 @@
@ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
private Date endDate;
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限（年）")
@TableField("contractPeriod")
@ExcelField(value = "合同期限(年)")
- private Integer contractPeriod = 0;
+ private String contractPeriod;
@FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
@TableField(exist = false)
@@ -100,11 +99,10 @@
// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
-
-
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
+// @TableField("sex")
// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ @TableField("sex")
private String sex = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -138,7 +136,7 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
-// @ExcelField(value = "备注")
+ @ExcelField(value = "备注")
private String remark = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -169,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 = "";
@@ -178,8 +183,7 @@
@TableField(exist = false)
private String endDateStr = "";
-
-
-
-
+ @TableField(exist = false)
+ @FieldInfo(name = "diffLabel", type = "varchar", explain = "到期提醒")
+ private String diffLabel = "";
}
--
Gitblit v1.8.0