From d9af3df5d3a3a948d3de74ef9b6092e570cf9772 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 00:34:39 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index d4062f0..e61591c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -7,6 +7,9 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -46,6 +49,7 @@
private final RedisService redisService;
private final EmpOccupationalMapper empOccupationalMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -160,14 +164,27 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpOccupational(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpOccupational empOccupational=new EmpOccupational();
empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empOccupational.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
- .getDeptId();
+ 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;
+ }
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo){
+ returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empOccupational.setDelFlag(2);
+ empOccupational.setEmpId(empBaseInfo.getEmpId());
empOccupational.setDeptName(list.get(1).toString());
- empOccupational.setDeptId(deptId);
+ empOccupational.setDeptId(dept.getDeptId());
empOccupational.setJobName(list.get(2).toString());
empOccupational.setEmpName(list.get(3).toString());
empOccupational.setCertificateNumb(list.get(4).toString());
@@ -184,7 +201,7 @@
empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empOccupational.setBedNumb(list.get(14).toString());
+ empOccupational.setBedNumb(list.get(13).toString());
}
if (StringUtils.isNotBlank(list.get(14).toString())) {
empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));
@@ -209,6 +226,7 @@
if (StringUtils.isNotBlank(list.get(22).toString())) {
empOccupational.setSettleDate(DateUtil.parseDate(list.get(22).toString()));
}
+ empOccupational.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(empOccupational);
}
}
--
Gitblit v1.8.0