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/EmpLaborTroubleServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 132 insertions(+), 5 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 0b5e2d4..32bdecb 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,9 +1,19 @@
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.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;
import org.springframework.transaction.annotation.Propagation;
@@ -13,9 +23,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -32,7 +46,9 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpLaborTroubleServiceImpl extends ServiceImpl<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {
+ 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");
@@ -41,20 +57,61 @@
public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpNumb())) {
+ queryWrapper.like(EmpLaborTrouble::getEmpNumb, empLabortrouble.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
+ queryWrapper.like(EmpLaborTrouble::getEmpName, empLabortrouble.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
+ queryWrapper.like(EmpLaborTrouble::getCertificateNumb, empLabortrouble.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
+ queryWrapper.like(EmpLaborTrouble::getDeptName, empLabortrouble.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
+ queryWrapper.between(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDateStr().split(",")[0],
+ empLabortrouble.getArbitrationDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
+ queryWrapper.between(EmpLaborTrouble::getSettleDate, empLabortrouble.getSettleDateStr().split(",")[0],
+ empLabortrouble.getSettleDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
+ queryWrapper.eq(EmpLaborTrouble::getArbitrationType, empLabortrouble.getArbitrationType());
+ }
+ if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
+ queryWrapper.eq(EmpLaborTrouble::getArbitrationStatus, empLabortrouble.getArbitrationStatus());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
+ queryWrapper.eq(EmpLaborTrouble::getEmpStatus, empLabortrouble.getEmpStatus());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
+ 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);
@@ -63,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());
@@ -104,4 +169,66 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empLabortroubleMapper.momentToNormal(list, operatorId)>0;
}
-}
\ No newline at end of file
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ 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);
+ 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;
+ }
+ empLabortrouble.setDelFlag(2);
+ empLabortrouble.setEmpId(empId);
+ empLabortrouble.setDeptName(list.get(1).toString());
+ empLabortrouble.setDeptId(dept.getDeptId());
+ empLabortrouble.setJobName(list.get(2).toString());
+ empLabortrouble.setEmpName(list.get(3).toString());
+ empLabortrouble.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
+ }
+ empLabortrouble.setArbitrationType(list.get(6).toString());
+ empLabortrouble.setArbitrationReason(list.get(7).toString());
+ empLabortrouble.setReporter(list.get(8).toString());
+ empLabortrouble.setRemark(list.get(9).toString());
+ if (StringUtils.isNotBlank(list.get(10).toString())) {
+ empLabortrouble.setArbitrationPay(new BigDecimal(list.get(10).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(11).toString())) {
+ empLabortrouble.setArbitrationStatus("未结案".equals(list.get(11).toString()) ? 0 : 1);
+ }
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empLabortrouble.setSettleDate(DateUtil.parseDate(list.get(12).toString()));
+ }
+ this.save(empLabortrouble);
+ }
+ }
+
+ 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