From 4e52cb2253af9a22571c7d0c239ee283178d2fd4 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 10:05:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java |  108 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
index bafb12d..059a74f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.server.hr.service;
 
+import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -9,51 +10,74 @@
 import java.util.List;
 
 /**
-*
-* name:EmpLabortrouble
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工劳资案件服务接口
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:59
-* @since JDK1.8
-*/
+ * name:EmpLabortrouble
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工劳资案件服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:36
+ * @since JDK1.8
+ */
 public interface IEmpLaborTroubleService extends IService<EmpLaborTrouble> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empLabortrouble empLabortrouble
-* @return IPage<EmpLabortrouble>
-*/
-IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble);
+    /**
+     * 查询（分页）
+     *
+     * @param request         QueryRequest
+     * @param empLabortrouble empLabortrouble
+     * @return IPage<EmpLabortrouble>
+     */
+    IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble);
 
-/**
-* 查询（所有）
-*
-* @param empLabortrouble empLabortrouble
-* @return List<EmpLabortrouble>
-*/
-List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble);
+    /**
+     * 查询（所有）
+     *
+     * @param empLabortrouble empLabortrouble
+     * @return List<EmpLabortrouble>
+     */
+    List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble);
 
-/**
-* 新增
-*
-* @param empLabortrouble empLabortrouble
-*/
-void createEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+    /**
+     * 新增
+     *
+     * @param empLabortrouble empLabortrouble
+     */
+    void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException;
 
-/**
-* 修改
-*
-* @param empLabortrouble empLabortrouble
-*/
-void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+    /**
+     * 修改
+     *
+     * @param empLabortrouble empLabortrouble
+     */
+    void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException;
 
-/**
-* 删除
-*
-* @param empLabortrouble empLabortrouble
-*/
-void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+    /**
+     * 删除
+     *
+     * @param empLabortrouble empLabortrouble
+     */
+    void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+
+    /**
+     * 根据Id批量逻辑删除记录
+     * <p>
+     * date 2021-01-28 10:48
+     *
+     * @param ids 待删除Id
+     * @return void
+     * @author: luoyibo
+     */
+    void logicDelEmpLabortrouble(String ids);
+
+    /**
+     * 从暂存状态转成正式状态
+     * <p>
+     * date 2021-02-04 21:11
+     *
+     * @param ids 待转换记录Id
+     * @return boolean
+     * @author: luoyibo
+     */
+    boolean momentToNormal(String ids);
+
+	void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList);
 }

--
Gitblit v1.8.0