From a332ffab46b0d30e85b73ec023aa4e30c7b69e52 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:36:25 +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 | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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..83fbff7 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,5 +1,7 @@
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;
@@ -8,6 +10,9 @@
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 +34,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);
+
/**
* 查询（所有）
@@ -125,7 +140,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);
@@ -163,5 +178,24 @@
* 导入员工
* @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;
+
+ /**
+ *
+ * 增加在职员工信息
+ *
+ * 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