From dfed60326c07756d3710d74c3aa44b537602adda Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 09 三月 2021 22:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 5576348..a8f3c19 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
@@ -6,6 +6,7 @@
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
import cn.hutool.core.util.StrUtil;
@@ -47,6 +48,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");
@@ -77,7 +79,7 @@
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());
@@ -155,11 +157,18 @@
dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
dimissionAttend.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ 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),list.get(3).toString()));
+ returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
continue;
}
+ 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(empBaseInfo.getEmpId());
dimissionAttend.setDeptName(list.get(1).toString());
dimissionAttend.setDeptId(dept.getDeptId());
dimissionAttend.setJobName(list.get(2).toString());
@@ -183,6 +192,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