From 890be4f01daefbca6f085bb8314d40de282c1db8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 05 三月 2021 15:52:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java | 118 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 66 insertions(+), 52 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..b45697e 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
@@ -9,62 +9,76 @@
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);
+ /**
+ * 查询（所有）
+ *
+ * @param empContractinfo empContractinfo
+ * @return List<EmpContractinfo>
+ */
+ List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo);
-/**
-* 新增
-*
-* @param empContractinfo empContractinfo
-*/
-void createEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 新增
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void createEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-* 修改
-*
-* @param empContractinfo empContractinfo
-*/
-void updateEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 修改
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void updateEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-* 删除
-*
-* @param empContractinfo empContractinfo
-*/
-void deleteEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 删除
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void deleteEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpContractinfo(String ids);
+ /**
+ * 根据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);
+
+ void terminateContract(String empIds, String operatorId);
}
--
Gitblit v1.8.0