From 8bb9cf4117634383f45bc8e2be5c92993e5ef0b6 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期六, 20 二月 2021 12:01:26 +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 | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 c67a4d6..b436b0c 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
@@ -3,6 +3,8 @@
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;
@@ -123,7 +125,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);
@@ -134,4 +136,32 @@
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);
}
--
Gitblit v1.8.0