From ae8267320996082be9bae84aa5248ca76d735777 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 03 六月 2021 20:46:00 +0800
Subject: [PATCH] fix(bug修复): 查询bug

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java |   68 +++++++++++++++++++++++++++------
 1 files changed, 55 insertions(+), 13 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 fb0ceef..7853f4b 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,13 +1,19 @@
 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;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +35,16 @@
      * @return IPage<EmpBaseinfo>
      */
     IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo);
+
+    /**
+     * 智搜 查询（分页）
+     *
+     * @param request     QueryRequest
+     * @param empBaseInfo empBaseinfo
+     * @return IPage<EmpBaseinfo>
+     */
+    IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo);
+
 
     /**
      * 查询（所有）
@@ -93,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今年
@@ -125,7 +139,7 @@
 
     IPage<EmpLaborTrouble> empBaseInfoLzList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
 
-    IPage<?> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+    IPage<EmpJobChange> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
 
     IPage<EmpOccupational> empBaseInfoGsList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
 
@@ -138,30 +152,58 @@
     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);
+    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
+     *
+     * @param empBaseInfo 在职员工信息
+     * @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
+     * @author: luoyibo
+     */
+    EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo);
+
+    Long getEmpIdByEmpNumb(String empNumb);
+
+    EmpBaseInfo getEmpBaseInfoByEmpNumb(String empNumb);
+
+    void exportEmpAll(HttpServletResponse response, EmpBaseInfo empBaseinfo) throws IOException;
+
+    boolean verifyCertificateNumb(EmpBaseInfo empBaseInfo);
+
+    List<EmpBaseInfo> listAll(QueryWrapper<EmpBaseInfo> wrapper);
+
+    boolean updateSeniority();
+
+    boolean updateDeptName();
 }

--
Gitblit v1.8.0