From 749ad6fe2e845433622992aa0aacd8b0d7714ccc Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 00:34:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index f532a8e..9027d66 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -2,13 +2,16 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +46,7 @@
private final RedisService redisService;
private final EmpBadRecordMapper empBadrecordMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -87,9 +91,9 @@
LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
- lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBadrecord.setCreator(operatorId);
@@ -103,10 +107,10 @@
LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
- lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
lambdaQueryWrapper.ne(EmpBadRecord::getBadId,empBadrecord.getBadId());
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
empBadrecord.setCreateTime(dbData.getCreateTime());
@@ -151,16 +155,29 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpBadRecord(List<List<Object>> listObject) {
+ public void importEmpBadRecord(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpBadRecord empBadrecord=new EmpBadRecord();
empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBadrecord.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;
+ }
+ empBadrecord.setDelFlag(2);
+ empBadrecord.setEmpId(empId);
empBadrecord.setDeptName(list.get(1).toString());
- empBadrecord.setDeptId(deptId);
+ empBadrecord.setDeptId(dept.getDeptId());
empBadrecord.setJobName(list.get(2).toString());
empBadrecord.setEmpName(list.get(3).toString());
empBadrecord.setCertificateNumb(list.get(4).toString());
--
Gitblit v1.8.0