From ea1a4b7994b0d9710c47cbb54b7824a9f4bd72c9 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 27 三月 2026 17:02:33 +0800
Subject: [PATCH] fix(EmpContractInfo): 修正导入合同信息的循环缩进并添加结束日期差值计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java | 161 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 107 insertions(+), 54 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 303de62..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,70 +1,123 @@
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;
import java.util.List;
/**
-*
-* name:EmpContractinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工合同信息服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:28:23
-* @since JDK1.8
-*/
+ * name:EmpContractinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工合同信息服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:28:23
+ * @since JDK1.8
+ */
public interface IEmpContractInfoService extends IService<EmpContractInfo> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empContractinfo empContractinfo
-* @return IPage<EmpContractinfo>
-*/
-IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empContractinfo empContractinfo
+ * @return IPage<EmpContractinfo>
+ */
+ IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
-/**
-* 查询（所有）
-*
-* @param empContractinfo empContractinfo
-* @return List<EmpContractinfo>
-*/
-List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo);
+ IPage<EmpContractInfo> findRemindContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
-/**
-* 新增
-*
-* @param empContractinfo empContractinfo
-*/
-void createEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 查询（所有）
+ *
+ * @param empContractinfo empContractinfo
+ * @return List<EmpContractinfo>
+ */
+ List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo);
-/**
-* 修改
-*
-* @param empContractinfo empContractinfo
-*/
-void updateEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 新增
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void createEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-* 删除
-*
-* @param empContractinfo empContractinfo
-*/
-void deleteEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 修改
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void updateEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpContractinfo(String ids);
+ /**
+ * 删除
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void deleteEmpContractinfo(EmpContractInfo empContractinfo);
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpContractinfo(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @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