fix(bug修复): 导入的新员工增加了入离职记录；重新处理了导入的日期格式

luoyb

2021-08-03 fb9823428a7705d8ed8e2f4128e525df3781e968

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

@@ -1,38 +1,34 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.exception.FebsException;
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.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
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 lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;

@@ -73,7 +69,7 @@
            queryWrapper.like("a.CertificateNumb", empResign.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empResign.getDeptName())) {
            queryWrapper.like("a.DeptName", empResign.getDeptName());
            queryWrapper.like("b.allDeptName", empResign.getDeptName());
        }
        if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
           queryWrapper.between("a.ApplayDate", empResign.getApplayDateStr().split(",")[0],  empResign.getApplayDateStr().split(",")[1]);
@@ -83,11 +79,9 @@
        }
        if (StringUtils.isNotBlank(empResign.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
        return empResignMapper.selectPageVo(page, queryWrapper);
    }

@@ -170,13 +164,16 @@
   @Transactional(rollbackFor = Exception.class)
   public void importEmpResign(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;
            }
         EmpResign resign = new EmpResign();
         resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         resign.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()));
@@ -187,16 +184,22 @@
                returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            resign.setDelFlag(2);
            resign.setDelFlag(0);
            resign.setEmpId(empId);
         resign.setDeptName(list.get(1).toString());
         resign.setDeptId(dept.getDeptId());
         resign.setJobName(list.get(2).toString());
         resign.setEmpName(list.get(3).toString());
         resign.setCertificateNumb(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            resign.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
         }
         try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    resign.setApplayDate(DateUtil.parse(list.get(5).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

         resign.setReason(list.get(6).toString());
         resign.setReporter(list.get(7).toString());
         resign.setRemark(list.get(8).toString());