From dfed60326c07756d3710d74c3aa44b537602adda Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 09 三月 2021 22:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java |   76 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 1 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 9300cbe..74188ee 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,6 +1,7 @@
 package cc.mrbird.febs.server.hr.service;
 
-import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+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;
@@ -8,7 +9,11 @@
 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;
 
 /**
  * name:EmpBaseinfo
@@ -28,6 +33,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);
+
 
     /**
      * 查询（所有）
@@ -104,6 +119,40 @@
 
     /**
      *
+     *
+     * @param s
+     * @param btime
+     * @param index 0 今天 1本周 2本月 3今年
+     * @return
+     */
+    Map<String, Object> countBaseInfoList(String s, String btime, String index);
+
+    IPage<EmpBaseInfo> baseInfoList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpBaseInfo> baseInfoHeList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpDimissionAttend> empBaseInfoCqList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpLeaveInfo> empBaseInfoQjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpPhysicalExam> empBaseInfoTjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpLaborTrouble> empBaseInfoLzList(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);
+
+    IPage<EmpAccidentCases> empBaseInfoYwList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpInsurance> empBaseInfoSbList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpUnemployment> empBaseInfoSyjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpBadRecord> empBaseInfoBlList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    /**
+     *
      * 关闭员工档案
      *
      * date 2021-02-18 12:54
@@ -123,4 +172,29 @@
      * @return boolean
      */
     boolean changeEmpJob(EmpJobChange empJobChange);
+
+    /**
+     * 导入员工
+     * @param listObject
+     */
+	void importEmpBaseInfo(List<List<Object>> listObject,List<String>  returnList) throws FebsException;
+
+    void getImage(String empId, HttpServletResponse response) throws Exception;
+
+    /**
+     *
+     * 增加在职员工信息
+     *
+     * date 2021-03-03 00:06
+     * @author: luoyibo
+     * @param empBaseInfo 在职员工信息
+     * @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
+     */
+    EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo);
+
+    Long getEmpIdByEmpNumb(String empNumb);
+
+    EmpBaseInfo getEmpBaseInfoByEmpNumb(String empNumb);
+
+  void   exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException;
 }

--
Gitblit v1.8.0