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/EmpUnemploymentServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 1b2cbdf..692afaf 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -6,6 +6,11 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
+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;
@@ -45,6 +50,7 @@
private final RedisService redisService;
private final EmpUnemploymentMapper empUnemploymentMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -84,7 +90,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate() );
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empUnemployment.setCreator(operatorId);
empUnemployment.setModifier(operatorId);
@@ -93,7 +106,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
EmpUnemployment dbData = this.getById(empUnemployment.getUnemploymentId());
empUnemployment.setCreateTime(dbData.getCreateTime());
empUnemployment.setCreator(dbData.getCreator());
@@ -138,16 +159,29 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpUnemployment(List<List<Object>> listObject) {
+ public void importEmpUnemployment(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpUnemployment empUnemployment=new EmpUnemployment();
empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empUnemployment.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;
+ }
+ empUnemployment.setDelFlag(2);
+ empUnemployment.setEmpId(empId);
empUnemployment.setDeptName(list.get(1).toString());
- empUnemployment.setDeptId(deptId);
+ empUnemployment.setDeptId(dept.getDeptId());
empUnemployment.setJobName(list.get(2).toString());
empUnemployment.setEmpName(list.get(3).toString());
empUnemployment.setCertificateNumb(list.get(4).toString());
@@ -161,4 +195,4 @@
this.save(empUnemployment);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0