From 3ca0d2b2941d55398099af8679c66f2866a55cc1 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 02:16:18 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
index 814ddaa..9ec5af3 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
@@ -9,6 +9,10 @@
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
+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;
@@ -48,6 +52,7 @@
private final RedisService redisService;
private final EmpAccidentCasesMapper empAccidentcasesMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()).map(u -> u.getUserId().toString())
.orElse("1");
@@ -101,9 +106,9 @@
LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
- lambdaQueryWrapper.eq(EmpAccidentCases::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
if (empAccidentcases.getReprotTime() == null) {
@@ -126,10 +131,10 @@
LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
- lambdaQueryWrapper.eq(EmpAccidentCases::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
lambdaQueryWrapper.ne(EmpAccidentCases::getAccidentId,empAccidentcases.getAccidentId());
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
empAccidentcases.setCreateTime(dbData.getCreateTime());
@@ -174,16 +179,29 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpAccidentCases(List<List<Object>> listObject) {
+ public void importEmpAccidentCases(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpAccidentCases empAccidentcases=new EmpAccidentCases();
empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empAccidentcases.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;
+ }
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工意外险案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empAccidentcases.setDelFlag(2);
+ empAccidentcases.setEmpId(empId);
empAccidentcases.setDeptName(list.get(1).toString());
- empAccidentcases.setDeptId(deptId);
+ empAccidentcases.setDeptId(dept.getDeptId());
empAccidentcases.setJobName(list.get(2).toString());
empAccidentcases.setEmpName(list.get(3).toString());
empAccidentcases.setCertificateNumb(list.get(4).toString());
--
Gitblit v1.8.0