fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题

luoyb

2024-06-02 f4151abee349597ed58a405a8a5e48a5d1a1f7a6

 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]);
@@ -195,9 +191,15 @@
         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());