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/service/IEmpContractInfoService.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
index b181820..a35a360 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
@@ -1,9 +1,8 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
-
-import cc.mrbird.febs.common.core.entity.QueryRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -27,6 +26,8 @@
* @return IPage<EmpContractinfo>
*/
IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
+
+ IPage<EmpContractInfo> findRemindContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
/**
* 查询（所有）
@@ -82,4 +83,41 @@
void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems );
void terminateContract(String empIds, String operatorId);
+
+ void autoStopContract(String operatorId);
+
+ /*
+ *
+ * 更新合同的到期天数
+ *
+ * date 2024-03-09 16:53
+ * @author: luoyibo
+ * @param 1
+ * @return void
+ */
+ void updateContractRemindDay();
+
+ /*
+ *
+ * 设置合同不再提醒
+ *
+ * date 2024-03-09 22:07
+ * @author: luoyibo
+ * @param empContractinfo 合同信息
+ * @return void
+ */
+ void updateEmpContractRemind(EmpContractInfo empContractinfo);
+
+ /**
+ *
+ * 提醒合同的续签操作
+ *
+ * date 2024-03-09 23:04
+ * @author: luoyibo
+ * @param empContractinfo 合同信息
+ * @return void
+ */
+ void continueEmpContract(EmpContractInfo empContractinfo);
+ void retireRehireEmpContract(EmpContractInfo empContractinfo);
+
}
--
Gitblit v1.8.0