From 4e52cb2253af9a22571c7d0c239ee283178d2fd4 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 10:05:18 +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 | 21 ++++++++++++++++++++-
1 files changed, 20 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 e021384..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,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -10,6 +11,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -175,7 +177,24 @@
* 导入员工
* @param listObject
*/
- void importEmpBaseInfo(List<List<Object>> 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