From cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 13 三月 2021 19:00:17 +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 | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 74188ee..ef0e4cb 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.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.*;
@@ -35,7 +36,7 @@
IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo);
/**
- *智搜 查询（分页）
+ * 智搜 查询（分页）
*
* @param request QueryRequest
* @param empBaseInfo empBaseinfo
@@ -107,19 +108,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今年
@@ -152,43 +151,44 @@
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,List<String> returnList) throws FebsException;
+ 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
- * @author: luoyibo
+ *
* @param empBaseInfo 在职员工信息
* @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
+ * @author: luoyibo
*/
EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo);
@@ -196,5 +196,7 @@
EmpBaseInfo getEmpBaseInfoByEmpNumb(String empNumb);
- void exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException;
+ void exportEmpAll(HttpServletResponse response, EmpBaseInfo empBaseinfo) throws IOException;
+
+ boolean verifyCertificateNumb(EmpBaseInfo empBaseInfo);
}
--
Gitblit v1.8.0