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/EmpLaborTroubleServiceImpl.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 2636619..1751d97 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -1,13 +1,18 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
-import cc.mrbird.febs.server.hr.entity.EmpOccupational;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
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 +48,7 @@
private final RedisService redisService;
private final EmpLaborTroubleMapper empLabortroubleMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -84,19 +90,28 @@
queryWrapper.like(EmpLaborTrouble::getArbitrationReason, empLabortrouble.getArbitrationReason());
}
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ IPage<EmpLaborTrouble> iPage = this.page(page, queryWrapper);
+ iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
+ return iPage;
}
@Override
public List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
- return this.baseMapper.selectList(queryWrapper);
+ return this.convertDicItemName(this.baseMapper.selectList(queryWrapper));
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
+ public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
+ LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
+ lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empLabortrouble.setCreator(operatorId);
empLabortrouble.setModifier(operatorId);
@@ -105,7 +120,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
+ public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
+ LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
+ lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId,empLabortrouble.getArbitrationId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
empLabortrouble.setCreateTime(dbData.getCreateTime());
empLabortrouble.setCreator(dbData.getCreator());
@@ -149,16 +172,29 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpLaborTrouble(List<List<Object>> listObject) {
+ public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empLabortrouble.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;
+ }
+ empLabortrouble.setDelFlag(2);
+ empLabortrouble.setEmpId(empBaseInfo.getEmpId());
empLabortrouble.setDeptName(list.get(1).toString());
- empLabortrouble.setDeptId(deptId);
+ empLabortrouble.setDeptId(dept.getDeptId());
empLabortrouble.setJobName(list.get(2).toString());
empLabortrouble.setEmpName(list.get(3).toString());
empLabortrouble.setCertificateNumb(list.get(4).toString());
@@ -178,7 +214,22 @@
if (StringUtils.isNotBlank(list.get(12).toString())) {
empLabortrouble.setSettleDate(DateUtil.parseDate(list.get(12).toString()));
}
+ empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(empLabortrouble);
}
}
-}
\ No newline at end of file
+
+ private List<EmpLaborTrouble> convertDicItemName(List<EmpLaborTrouble> list){
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ //仲裁类型
+ p.setArbitrationTypeName(dicItems.stream()
+ .filter(k -> DicCode.ARBITRATIONTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("劳资纠纷"));
+ });
+
+ return list;
+ }
+}
--
Gitblit v1.8.0