From cfce5a0402f09b7f7891f045a77b8a9ceea69e1f Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 23:29:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java |  107 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
index 1fae596..7b70e35 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
@@ -9,51 +9,74 @@
 import java.util.List;
 
 /**
-*
-* name:EmpWorkexperinece
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工作经历服务接口
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:04
-* @since JDK1.8
-*/
+ * name:EmpWorkexperience
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工作经历服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-28 12:33:31
+ * @since JDK1.8
+ */
 public interface IEmpWorkExperienceService extends IService<EmpWorkExperience> {
-/**
-* 查询(分页)
-*
-* @param request QueryRequest
-* @param empWorkexperinece empWorkexperinece
-* @return IPage<EmpWorkexperinece>
-*/
-IPage<EmpWorkExperience> findEmpWorkexperineces(QueryRequest request, EmpWorkExperience empWorkexperinece);
+    /**
+     * 查询(分页)
+     *
+     * @param request           QueryRequest
+     * @param empWorkexperience empWorkexperience
+     * @return IPage<EmpWorkexperience>
+     */
+    IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience);
 
-/**
-* 查询(所有)
-*
-* @param empWorkexperinece empWorkexperinece
-* @return List<EmpWorkexperinece>
-*/
-List<EmpWorkExperience> findEmpWorkexperineces(EmpWorkExperience empWorkexperinece);
+    /**
+     * 查询(所有)
+     *
+     * @param empWorkexperience empWorkexperience
+     * @return List<EmpWorkexperience>
+     */
+    List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience);
 
-/**
-* 新增
-*
-* @param empWorkexperinece empWorkexperinece
-*/
-void createEmpWorkexperinece(EmpWorkExperience empWorkexperinece);
+    /**
+     * 新增
+     *
+     * @param empWorkexperience empWorkexperience
+     */
+    void createEmpWorkExperience(EmpWorkExperience empWorkexperience);
 
-/**
-* 修改
-*
-* @param empWorkexperinece empWorkexperinece
-*/
-void updateEmpWorkexperinece(EmpWorkExperience empWorkexperinece);
+    /**
+     * 修改
+     *
+     * @param empWorkexperience empWorkexperience
+     */
+    void updateEmpWorkExperience(EmpWorkExperience empWorkexperience);
 
-/**
-* 删除
-*
-* @param empWorkexperinece empWorkexperinece
-*/
-void deleteEmpWorkexperinece(EmpWorkExperience empWorkexperinece);
+    /**
+     * 删除
+     *
+     * @param empWorkexperience empWorkexperience
+     */
+    void deleteEmpWorkExperience(EmpWorkExperience empWorkexperience);
+
+    /**
+     * 根据Id批量逻辑删除记录
+     * <p>
+     * date 2021-01-28 10:48
+     *
+     * @param ids 待删除Id
+     * @return void
+     * @author: luoyibo
+     */
+    void logicDelEmpWorkExperience(String ids);
+
+    /**
+     * 从暂存状态转成正式状态
+     * <p>
+     * date 2021-02-04 21:11
+     *
+     * @param ids 待转换记录Id
+     * @return boolean
+     * @author: luoyibo
+     */
+    boolean momentToNormal(String ids);
+
+	void importEmpWorkExperience(List<List<Object>> listObject,List<String>  returnList);
 }

--
Gitblit v1.8.0