From 8a2f817bc1a489f873e048d36e24f355bdb55756 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 15:44:05 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 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 f9e62d6..1c20cb2 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,8 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+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;
@@ -14,18 +16,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;
@@ -47,45 +52,48 @@
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.eq("a.EmpStatus", empOccupational.getEmpStatus());
}
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ return empOccupationalMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -168,11 +176,18 @@
empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empOccupational.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(3).toString())).findFirst().orElse(null);
+ 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),list.get(3).toString()));
+ 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;
+ }
+ empOccupational.setDelFlag(2);
+ empOccupational.setEmpId(empBaseInfo.getEmpId());
empOccupational.setDeptName(list.get(1).toString());
empOccupational.setDeptId(dept.getDeptId());
empOccupational.setJobName(list.get(2).toString());
@@ -191,7 +206,7 @@
empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empOccupational.setBedNumb(list.get(14).toString());
+ empOccupational.setBedNumb(list.get(13).toString());
}
if (StringUtils.isNotBlank(list.get(14).toString())) {
empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));
@@ -216,6 +231,7 @@
if (StringUtils.isNotBlank(list.get(22).toString())) {
empOccupational.setSettleDate(DateUtil.parseDate(list.get(22).toString()));
}
+ empOccupational.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(empOccupational);
}
}
--
Gitblit v1.8.0