From 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 13:59:23 +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 |   97 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 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 63c6390..e4ad447 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,12 +1,18 @@
 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;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
 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.util.List;
+import java.util.Map;
 
 /**
  * name:EmpBaseinfo
@@ -26,6 +32,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);
+
 
     /**
      * 查询（所有）
@@ -99,4 +115,83 @@
      * @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
      */
     EmpBaseInfo getEmpBaseInfo(EmpBaseInfo empBaseInfo);
+
+    /**
+     *
+     *
+     * @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
+     * @author: luoyibo
+     * @param empDimissionLog
+     * @return boolean
+     */
+    boolean closeEmpArchives(EmpDimissionLog empDimissionLog);
+
+    /**
+     *
+     * 员工岗位变更
+     *
+     * date 2021-02-18 20:32
+     * @author: luoyibo
+     * @param empJobChange 1
+     * @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);
 }

--
Gitblit v1.8.0