修改bug

yz_08

2021-03-23 352f4d4a3ae3145f2bd43d0802150877349750d6

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java

@@ -6,7 +6,9 @@
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
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.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
@@ -17,18 +19,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.EmpUnemployment;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpUnemploymentMapper;
import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
import cn.hutool.core.date.DateUtil;
@@ -51,34 +56,40 @@
   private final RedisService redisService;
    private final EmpUnemploymentMapper empUnemploymentMapper;
    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<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment) {
        LambdaQueryWrapper<EmpUnemployment> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpUnemployment::getDelFlag, empUnemployment.getDelFlag());
       QueryWrapper<EmpUnemployment> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empUnemployment.getDelFlag());
        if (StringUtils.isNotBlank(empUnemployment.getEmpNumb())) {
            queryWrapper.like(EmpUnemployment::getEmpNumb, empUnemployment.getEmpNumb());
            queryWrapper.like("a.EmpNumb", empUnemployment.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empUnemployment.getEmpName())) {
            queryWrapper.like(EmpUnemployment::getEmpName, empUnemployment.getEmpName());
            queryWrapper.like("a.EmpName", empUnemployment.getEmpName());
        }
        if (StringUtils.isNotBlank(empUnemployment.getCertificateNumb())) {
            queryWrapper.like(EmpUnemployment::getCertificateNumb, empUnemployment.getCertificateNumb());
            queryWrapper.like("a.CertificateNumb", empUnemployment.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empUnemployment.getDeptName())) {
            queryWrapper.like(EmpUnemployment::getDeptName, empUnemployment.getDeptName());
            queryWrapper.like("a.DeptName", empUnemployment.getDeptName());
        }
        if (StringUtils.isNotBlank(empUnemployment.getApplayDateStr())) {
           queryWrapper.between(EmpUnemployment::getApplayDate, empUnemployment.getApplayDateStr().split(",")[0],  empUnemployment.getApplayDateStr().split(",")[1]);
           queryWrapper.between("a.ApplayDate", empUnemployment.getApplayDateStr().split(",")[0],  empUnemployment.getApplayDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empUnemployment.getApplayReason())) {
            queryWrapper.like(EmpUnemployment::getApplayReason, empUnemployment.getApplayReason());
            queryWrapper.like("a.ApplayReason", empUnemployment.getApplayReason());
        }
        if (StringUtils.isNotBlank(empUnemployment.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empUnemployment.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        return empUnemploymentMapper.selectPageVo(page, queryWrapper);
    }

    @Override
@@ -161,13 +172,16 @@
   @Transactional(rollbackFor = Exception.class)
    public void importEmpUnemployment(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
          EmpUnemployment empUnemployment=new EmpUnemployment();
          empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
          empUnemployment.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()));