From 567a11a82c7168473b75c0d9b82cc56622a61ab6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 07:54:15 +0800
Subject: [PATCH] fix(bug修复): 打开档案时同时写入离职表
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index 2db1b1e..5202bb5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
@@ -9,6 +11,7 @@
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -48,6 +51,7 @@
private final RedisService redisService;
private final EmpDimissionAttendMapper empDimissionattendMapper;
private final IRemoteDeptService remoteDeptService;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -78,10 +82,11 @@
queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
}
if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empDimissionattend.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empDimissionattend.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
return empDimissionattendMapper.selectPageVo(page, queryWrapper);
}
@@ -149,31 +154,37 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpDimissionAttend(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
dimissionAttend.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
continue;
}
- Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
- if (null == empId){
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo){
returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
dimissionAttend.setDelFlag(2);
- dimissionAttend.setEmpId(empId);
+ dimissionAttend.setEmpId(empBaseInfo.getEmpId());
dimissionAttend.setDeptName(list.get(1).toString());
dimissionAttend.setDeptId(dept.getDeptId());
dimissionAttend.setJobName(list.get(2).toString());
dimissionAttend.setEmpName(list.get(3).toString());
dimissionAttend.setCertificateNumb(list.get(4).toString());
- dimissionAttend.setAttendMonth(list.get(5).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())){
+ dimissionAttend.setAttendMonth(DateUtil.formatDate(DateUtil.parse(list.get(5).toString())));
+ }
+
if (StringUtils.isNotBlank(list.get(6).toString())) {
dimissionAttend.setAttendDays(new BigDecimal(list.get(6).toString()));
}
@@ -191,6 +202,7 @@
dimissionAttend.setAbsenteeism(new BigDecimal(list.get(11).toString()));
}
dimissionAttend.setRemark(list.get(12).toString());
+ dimissionAttend.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(dimissionAttend);
}
}
--
Gitblit v1.8.0