From fb9823428a7705d8ed8e2f4128e525df3781e968 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 03 八月 2021 10:21:09 +0800
Subject: [PATCH] fix(bug修复): 导入的新员工增加了入离职记录；重新处理了导入的日期格式

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.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/IEmpOccupationalService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
index 5446724..cbfbf69 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.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.EmpOccupational;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -9,51 +10,74 @@
 import java.util.List;
 
 /**
-*
-* name:EmpOccupational
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件服务接口
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:24
-* @since JDK1.8
-*/
+ * name:EmpOccupational
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工伤案件服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:32
+ * @since JDK1.8
+ */
 public interface IEmpOccupationalService extends IService<EmpOccupational> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empOccupational empOccupational
-* @return IPage<EmpOccupational>
-*/
-IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational);
+    /**
+     * 查询（分页）
+     *
+     * @param request         QueryRequest
+     * @param empOccupational empOccupational
+     * @return IPage<EmpOccupational>
+     */
+    IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational);
 
-/**
-* 查询（所有）
-*
-* @param empOccupational empOccupational
-* @return List<EmpOccupational>
-*/
-List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational);
+    /**
+     * 查询（所有）
+     *
+     * @param empOccupational empOccupational
+     * @return List<EmpOccupational>
+     */
+    List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational);
 
-/**
-* 新增
-*
-* @param empOccupational empOccupational
-*/
-void createEmpOccupational(EmpOccupational empOccupational);
+    /**
+     * 新增
+     *
+     * @param empOccupational empOccupational
+     */
+    void createEmpOccupational(EmpOccupational empOccupational) throws FebsException;
 
-/**
-* 修改
-*
-* @param empOccupational empOccupational
-*/
-void updateEmpOccupational(EmpOccupational empOccupational);
+    /**
+     * 修改
+     *
+     * @param empOccupational empOccupational
+     */
+    void updateEmpOccupational(EmpOccupational empOccupational);
 
-/**
-* 删除
-*
-* @param empOccupational empOccupational
-*/
-void deleteEmpOccupational(EmpOccupational empOccupational);
+    /**
+     * 删除
+     *
+     * @param empOccupational empOccupational
+     */
+    void deleteEmpOccupational(EmpOccupational empOccupational);
+
+    /**
+     * 根据Id批量逻辑删除记录
+     * <p>
+     * date 2021-01-28 10:48
+     *
+     * @param ids 待删除Id
+     * @return void
+     * @author: luoyibo
+     */
+    void logicDelEmpOccupational(String ids);
+
+    /**
+     * 从暂存状态转成正式状态
+     * <p>
+     * date 2021-02-04 21:11
+     *
+     * @param ids 待转换记录Id
+     * @return boolean
+     * @author: luoyibo
+     */
+    boolean momentToNormal(String ids);
+
+	void importEmpOccupational(List<List<Object>> listObject,List<String>  returnList);
 }

--
Gitblit v1.8.0