From d8da861e315c42930d2dffae66b90f4e489f9d2b Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 19 二月 2021 00:20:24 +0800
Subject: [PATCH] 修改附件管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 5 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 cbdddc2..567e977 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
@@ -1,11 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
+import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
+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 +50,8 @@
private final RedisService redisService;
private final IRemoteDeptService remoteDeptService;
private final EmpBaseInfoMapper empBaseInfoMapper;
+ private final IEmpDimissionLogService dimissionLogService;
+ private final IEmpJobChangeService jobChangeService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -253,4 +257,82 @@
return this.getOne(queryWrapper);
}
+ /**
+ *
+ * 关闭员工档案
+ *
+ * date 2021-02-18 12:54
+ * @author: luoyibo
+ * @param empDimissionLog
+ * @return boolean
+ */
+ @Override
+ public boolean closeEmpArchives(EmpDimissionLog empDimissionLog) {
+ String[] str = empDimissionLog.getEmpIds().split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ 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;
+ }
+ /**
+ *
+ * 员工岗位变更
+ *
+ * date 2021-02-18 20:32
+ * @author: luoyibo
+ * @param empJobChange 1
+ * @return boolean
+ */
+ @Override
+ public boolean changeEmpJob(EmpJobChange empJobChange) {
+ String[] str = empJobChange.getEmpIds().split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ String[] strName = empJobChange.getEmpNames().split(",");
+ String[] strDeptName = empJobChange.getOldDeptNames().split(",");
+ String[] strJobName = empJobChange.getOldJobNames().split(",");
+
+ EmpJobChange saveChange = null;
+
+ for (int i = 0,k=str.length; i <k ; i++) {
+ saveChange = new EmpJobChange();
+ saveChange.setJobChangeId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ saveChange.setEmpId(Long.parseLong(str[i]));
+ saveChange.setEmpName(strName[i]);
+ saveChange.setOldDeptName(strDeptName[i]);
+ saveChange.setOldJobName(strJobName[i]);
+ saveChange.setNewDeptName(empJobChange.getNewDeptName());
+ saveChange.setNewJobName(empJobChange.getNewJobName());
+ saveChange.setChangeType(empJobChange.getChangeType());
+ saveChange.setChangeDate(empJobChange.getChangeDate());
+ saveChange.setChangeReason(empJobChange.getChangeReason());
+ saveChange.setCreator(operatorId);
+ saveChange.setModifier(operatorId);
+
+ jobChangeService.save(saveChange);
+
+ }
+
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("deptId", empJobChange.getDeptId());
+ mapParams.put("deptName", empJobChange.getNewDeptName());
+ mapParams.put("jobId", empJobChange.getJobId());
+ mapParams.put("jobName", empJobChange.getNewJobName());
+ mapParams.put("operatorId", operatorId);
+ return empBaseInfoMapper.changeEmpJob(list,mapParams)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0