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/service/IEmpContractInfoService.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 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 437ffa0..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,8 +1,8 @@
package cc.mrbird.febs.server.hr.service;
-import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
-
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 com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -26,6 +26,8 @@
* @return IPage<EmpContractinfo>
*/
IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
+
+ IPage<EmpContractInfo> findRemindContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
/**
* 查询（所有）
@@ -77,4 +79,45 @@
* @author: luoyibo
*/
boolean momentToNormal(String ids);
+
+ 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