From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 199 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 158 insertions(+), 41 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 ff3cbb7..6ff6e37 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,25 +1,40 @@
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.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.SortUtil;
+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.entity.EmpOccupational;
-import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
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;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.constant.StringConstant;
+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.*;
/**
@@ -36,61 +51,75 @@
@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 IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
- LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
+ QueryWrapper<EmpLaborTrouble> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", 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());
- }
+ queryWrapper.like("a.EmpNumb", empLabortrouble.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
+ queryWrapper.like("a.EmpName", empLabortrouble.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
+ queryWrapper.like("b.allDeptName", empLabortrouble.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
+ queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
+ empLabortrouble.getArbitrationDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
+ queryWrapper.between("a.SettleDate", empLabortrouble.getSettleDateStr().split(",")[0],
+ empLabortrouble.getSettleDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
+ queryWrapper.eq("a.ArbitrationType", empLabortrouble.getArbitrationType());
+ }
+ if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
+ queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empLabortrouble.getEmpStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
+ queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "arbitrationDate", FebsConstant.ORDER_ASC, true);
+ IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(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);
@@ -99,7 +128,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());
@@ -138,6 +175,86 @@
public boolean momentToNormal(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- return empLabortroubleMapper.momentToNormal(list, operatorId)>0;
+ 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, List<DicItem> dicItems) {
+ for (List<Object> list : listObject) {
+ if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
+ 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);
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
+ }
+ 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(0);
+ empLabortrouble.setEmpId(empBaseInfo.getEmpId());
+ 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());
+
+ //仲裁类型
+ DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "zctype") && StrUtil.equals(j.getDicItemName(), list.get(6).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
+ empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
+ }
+
+
+ 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);
+ }
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empLabortrouble.setArbitrationDate(DateUtil.parse(list.get(5).toString()));
+ }
+
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empLabortrouble.setSettleDate(DateUtil.parse(list.get(12).toString()));
+ }
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
+ continue;
+ }
+
+ empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
+ 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.ZCTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse(""));
+ });
+
+ return list;
+ }
+}
--
Gitblit v1.8.0