From 63c7e9d7051ed6742eb7334346a53376b0247c29 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 01 四月 2021 09:46:03 +0800
Subject: [PATCH] 删除

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java |   39 ++++++++++++++++++++++-----------------
 1 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
index 74188ee..d2da7d1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
@@ -1,11 +1,13 @@
 package cc.mrbird.febs.server.hr.service;
 
+import cc.mrbird.febs.common.core.entity.system.DicItem;
 import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.server.hr.entity.*;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
 import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
 import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -35,7 +37,7 @@
     IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo);
 
     /**
-     *智搜 查询(分页)
+     * 智搜 查询(分页)
      *
      * @param request     QueryRequest
      * @param empBaseInfo empBaseinfo
@@ -107,19 +109,17 @@
     boolean momentToNormal(String ids);
 
     /**
-     *
      * 获取指定人员信息
-     *
+     * <p>
      * date 2021-02-17 08:12
-     * @author: luoyibo
+     *
      * @param empBaseInfo 获取条件
      * @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
+     * @author: luoyibo
      */
     EmpBaseInfo getEmpBaseInfo(EmpBaseInfo empBaseInfo);
 
     /**
-     *
-     *
      * @param s
      * @param btime
      * @param index 0 今天 1本周 2本月 3今年
@@ -152,43 +152,44 @@
     IPage<EmpBadRecord> empBaseInfoBlList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
 
     /**
-     *
      * 关闭员工档案
-     *
+     * <p>
      * date 2021-02-18 12:54
-     * @author: luoyibo
+     *
      * @param empDimissionLog
      * @return boolean
+     * @author: luoyibo
      */
     boolean closeEmpArchives(EmpDimissionLog empDimissionLog);
 
     /**
-     *
      * 员工岗位变更
-     *
+     * <p>
      * date 2021-02-18 20:32
-     * @author: luoyibo
+     *
      * @param empJobChange 1
      * @return boolean
+     * @author: luoyibo
      */
     boolean changeEmpJob(EmpJobChange empJobChange);
 
     /**
      * 导入员工
+     *
      * @param listObject
      */
-	void importEmpBaseInfo(List<List<Object>> listObject,List<String>  returnList) throws FebsException;
+    void importEmpBaseInfo(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) throws FebsException;
 
     void getImage(String empId, HttpServletResponse response) throws Exception;
 
     /**
-     *
      * 增加在职员工信息
-     *
+     * <p>
      * date 2021-03-03 00:06
-     * @author: luoyibo
+     *
      * @param empBaseInfo 在职员工信息
      * @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
+     * @author: luoyibo
      */
     EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo);
 
@@ -196,5 +197,9 @@
 
     EmpBaseInfo getEmpBaseInfoByEmpNumb(String empNumb);
 
-  void   exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException;
+    void exportEmpAll(HttpServletResponse response, EmpBaseInfo empBaseinfo) throws IOException;
+
+    boolean verifyCertificateNumb(EmpBaseInfo empBaseInfo);
+
+    List<EmpBaseInfo> listAll(QueryWrapper<EmpBaseInfo> wrapper);
 }

--
Gitblit v1.8.0