From d90db860b7ea15a6d6c58a3e77b649966f3ab6bf Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 08 四月 2026 21:05:26 +0800
Subject: [PATCH] fix(hr): 修正合同信息查询条件中的员工状态过滤
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 b48fd74..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,7 +78,7 @@
@ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
private Date endDate;
- @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限（年）")
@TableField("contractPeriod")
@ExcelField(value = "合同期限(年)")
private String contractPeriod;
@@ -171,6 +170,7 @@
// @Version
private Integer version = 0;
+ @FieldInfo(name = "diffDay", type = "varchar", explain = "距到期天数")
@TableField("diffDay")
private Integer diffDay = 0;
@@ -184,8 +184,6 @@
private String endDateStr = "";
@TableField(exist = false)
+ @FieldInfo(name = "diffLabel", type = "varchar", explain = "到期提醒")
private String diffLabel = "";
-
-
-
}
--
Gitblit v1.8.0