From 0959cb1ed63fcf0bbb3beffc8d8f56ad204d6ddc Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 27 六月 2021 20:45:42 +0800
Subject: [PATCH] fix(bug修复): 增加了处理到期合同的定时任务

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java |  116 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
index 8644b0d..0f37a9d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
@@ -9,62 +9,74 @@
 import java.util.List;
 
 /**
-*
-* name:EmpRemarkinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工备注信息服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:48
-* @since JDK1.8
-*/
+ * name:EmpRemarkinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工备注信息服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:48
+ * @since JDK1.8
+ */
 public interface IEmpRemarkinfoService extends IService<EmpRemarkInfo> {
-/**
-* 查询(分页)
-*
-* @param request QueryRequest
-* @param empRemarkinfo empRemarkinfo
-* @return IPage<EmpRemarkinfo>
-*/
-IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo);
+    /**
+     * 查询(分页)
+     *
+     * @param request       QueryRequest
+     * @param empRemarkinfo empRemarkinfo
+     * @return IPage<EmpRemarkinfo>
+     */
+    IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo);
 
-/**
-* 查询(所有)
-*
-* @param empRemarkinfo empRemarkinfo
-* @return List<EmpRemarkinfo>
-*/
-List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo);
+    /**
+     * 查询(所有)
+     *
+     * @param empRemarkinfo empRemarkinfo
+     * @return List<EmpRemarkinfo>
+     */
+    List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo);
 
-/**
-* 新增
-*
-* @param empRemarkinfo empRemarkinfo
-*/
-void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
+    /**
+     * 新增
+     *
+     * @param empRemarkinfo empRemarkinfo
+     */
+    void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
 
-/**
-* 修改
-*
-* @param empRemarkinfo empRemarkinfo
-*/
-void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
+    /**
+     * 修改
+     *
+     * @param empRemarkinfo empRemarkinfo
+     */
+    void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
 
-/**
-* 删除
-*
-* @param empRemarkinfo empRemarkinfo
-*/
-void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
+    /**
+     * 删除
+     *
+     * @param empRemarkinfo empRemarkinfo
+     */
+    void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
 
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpRemarkinfo(String ids);
+    /**
+     * 根据Id批量逻辑删除记录
+     * <p>
+     * date 2021-01-28 10:48
+     *
+     * @param ids 待删除Id
+     * @return void
+     * @author: luoyibo
+     */
+    void logicDelEmpRemarkinfo(String ids);
+
+    /**
+     * 从暂存状态转成正式状态
+     * <p>
+     * date 2021-02-04 21:11
+     *
+     * @param ids 待转换记录Id
+     * @return boolean
+     * @author: luoyibo
+     */
+    boolean momentToNormal(String ids);
+
+	void importEmpRemarkInfo(List<List<Object>> listObject,List<String>  returnList);
 }

--
Gitblit v1.8.0