From d4f05e52e15cae70763a00dcd4488277c5af1460 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 09 三月 2021 11:55:56 +0800
Subject: [PATCH] fix(bug修复): 导出Excel
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index e61591c..46b8305 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -7,6 +7,11 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.constant.DicCode;
+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.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
@@ -16,18 +21,21 @@
import org.springframework.transaction.annotation.Transactional;
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.constant.ModuleCode;
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 cc.mrbird.febs.server.hr.entity.EmpOccupational;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
import cn.hutool.core.date.DateUtil;
@@ -50,57 +58,72 @@
private final RedisService redisService;
private final EmpOccupationalMapper empOccupationalMapper;
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<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
- LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
+ QueryWrapper<EmpOccupational> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empOccupational.getDelFlag());
if (StringUtils.isNotBlank(empOccupational.getEmpNumb())) {
- queryWrapper.like(EmpOccupational::getEmpNumb, empOccupational.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empOccupational.getEmpNumb());
}
if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
- queryWrapper.like(EmpOccupational::getEmpName, empOccupational.getEmpName());
+ queryWrapper.like("a.EmpName", empOccupational.getEmpName());
}
if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
- queryWrapper.like(EmpOccupational::getCertificateNumb, empOccupational.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
}
if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
- queryWrapper.like(EmpOccupational::getDeptName, empOccupational.getDeptName());
+ queryWrapper.like("a.DeptName", empOccupational.getDeptName());
}
if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
- queryWrapper.between(EmpOccupational::getInjuredTime, empOccupational.getInjuredTimeStr().split(",")[0],
+ queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
empOccupational.getInjuredTimeStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
- queryWrapper.between(EmpOccupational::getHrDoDate, empOccupational.getHrDoDateStr().split(",")[0],
+ queryWrapper.between("a.HrDoDate", empOccupational.getHrDoDateStr().split(",")[0],
empOccupational.getHrDoDateStr().split(",")[1]);
}
if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
- queryWrapper.eq(EmpOccupational::getHospitalizatioFlag, empOccupational.getHospitalizatioFlag());
+ queryWrapper.eq("a.HospitalizatioFlag", empOccupational.getHospitalizatioFlag());
}
if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
- queryWrapper.eq(EmpOccupational::getSettleStatus, empOccupational.getSettleStatus());
+ queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
}
if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
- queryWrapper.eq(EmpOccupational::getEmpStatus, empOccupational.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
}
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ IPage<EmpOccupational> pageList = empOccupationalMapper.selectPageVo(page, queryWrapper);
+ List<EmpOccupational> list = pageList.getRecords();
+ //处理数据字典
+ pageList.setRecords(covertDicItemName(list));
+ return pageList;
}
@Override
public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
- return this.baseMapper.selectList(queryWrapper);
+ List<EmpOccupational> list = this.baseMapper.selectList(queryWrapper);
+ return covertDicItemName(list);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpOccupational(EmpOccupational empOccupational) {
+ public void createEmpOccupational(EmpOccupational empOccupational) throws FebsException {
+ LambdaQueryWrapper<EmpOccupational> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpOccupational::getEmpId, empOccupational.getEmpId());
+ lambdaQueryWrapper.eq(EmpOccupational::getInjuredTime, empOccupational.getInjuredTime());
+ lambdaQueryWrapper.ne(EmpOccupational::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
+
empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
if(empOccupational.getSubmitTime()==null){
empOccupational.setSubmitTime(empOccupational.getInjuredTime());
@@ -230,4 +253,18 @@
this.save(empOccupational);
}
}
+
+ private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list){
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.parallelStream().forEachOrdered(p -> {
+ // 设置结案状态
+ p.setSettleStatusName(dicItems.stream()
+ .filter(k -> DicCode.SETTLE_STATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getSettleStatus().toString()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse(""));
+ });
+
+ return list;
+ }
}
--
Gitblit v1.8.0