From 3d8f7b941393760faa8fb67af9baa95d5c2c8457 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 17:13:39 +0800
Subject: [PATCH] feat(在职员工): 关闭员工档案接口
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 77e4ad1..ab73df2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -6,6 +6,10 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -48,6 +52,7 @@
private final RedisService redisService;
private final IRemoteDeptService remoteDeptService;
private final EmpBaseInfoMapper empBaseInfoMapper;
+ private final IEmpDimissionLogService dimissionLogService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -259,16 +264,30 @@
*
* date 2021-02-18 12:54
* @author: luoyibo
- * @param ids 待关闭档案员工 Id
- * @param dimissionType 离职类型
- * @param dimissionDate 离职日期
- * @param remark 备注
+ * @param empDimissionLog
* @return boolean
*/
@Override
- public boolean closeEmpArchives(String ids, String dimissionType, Date dimissionDate, String remark) {
- String[] str = ids.split(",");
+ public boolean closeEmpArchives(EmpDimissionLog empDimissionLog) {
+ String[] str = empDimissionLog.getEmpIds().split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- return empBaseInfoMapper.closeEmpArchives(list, dimissionType, dimissionDate, remark, operatorId)>0;
+ String[] strDate = empDimissionLog.getEntryDates().split(",");
+ EmpDimissionLog dimissionLog = null;
+ for (int i = 0,k=str.length; i < k; i++) {
+ dimissionLog = new EmpDimissionLog();
+ dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionLog.setEmpId(Long.parseLong(str[i]));
+ dimissionLog.setEntryDate(DateUtil.parse(strDate[i],"yyyy-MM-dd"));
+ dimissionLog.setDimissionDate(empDimissionLog.getDimissionDate());
+ dimissionLog.setDimissionType(empDimissionLog.getDimissionType());
+ dimissionLog.setRemark(empDimissionLog.getRemark());
+ dimissionLog.setSelfLeaveDay(empDimissionLog.getSelfLeaveDay());
+ dimissionLog.setReporter(empDimissionLog.getReporter());
+ dimissionLog.setCreator(operatorId);
+ dimissionLog.setModifier(operatorId);
+
+ dimissionLogService.save(dimissionLog);
+ }
+ return empBaseInfoMapper.closeEmpArchives(list, empDimissionLog.getDimissionType(), empDimissionLog.getDimissionDate(), empDimissionLog.getRemark(), operatorId)>0;
}
}
\ No newline at end of file
--
Gitblit v1.8.0