fix(人力微服务):

yz

2021-05-28 511a66546a655c9e5b44317ca82ae60fe5f2bf0d

fix(人力微服务):

修改导入日期的格式化

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

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

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

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.system.SystemUser;
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.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpAccidentCasesMapper;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
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.Propagation;
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.EmpAccidentCases;
import cc.mrbird.febs.server.hr.mapper.EmpAccidentCasesMapper;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
import cn.hutool.core.date.DateUtil;
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.math.BigDecimal;
import java.util.*;

/**
 * name:EmpAccidentcases package:cc.mrbird.febs.server.hr.controller
@@ -54,212 +46,220 @@
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpAccidentCasesServiceImpl extends ServiceImpl<EmpAccidentCasesMapper, EmpAccidentCases>
        implements IEmpAccidentCasesService {
        implements IEmpAccidentCasesService {

    private final RedisService redisService;
    private final EmpAccidentCasesMapper empAccidentcasesMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()).map(u -> u.getUserId().toString())
            .orElse("1");
    private final RedisService redisService;
    private final EmpAccidentCasesMapper empAccidentcasesMapper;
    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<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
        QueryWrapper<EmpAccidentCases> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empAccidentcases.getDelFlag());
        if (StringUtils.isNotBlank(empAccidentcases.getEmpNumb())) {
            queryWrapper.like("a.EmpNumb", empAccidentcases.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getEmpName())) {
            queryWrapper.like("a.EmpName", empAccidentcases.getEmpName());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getCertificateNumb())) {
            queryWrapper.like("a.CertificateNumb", empAccidentcases.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getDeptName())) {
            queryWrapper.like("b.allDeptName", empAccidentcases.getDeptName());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getInjuredTimeStr())) {
            queryWrapper.between("a.InjuredTime", empAccidentcases.getInjuredTimeStr().split(",")[0],
                    empAccidentcases.getInjuredTimeStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empAccidentcases.getHrDoDateStr())) {
            queryWrapper.between("a.HrDoDate", empAccidentcases.getHrDoDateStr().split(",")[0],
                    empAccidentcases.getHrDoDateStr().split(",")[1]);
        }
        if (empAccidentcases.getHospitalizatioFlag() != null && empAccidentcases.getHospitalizatioFlag() != 0) {
            queryWrapper.eq("a.HospitalizatioFlag", empAccidentcases.getHospitalizatioFlag());
        }
        if (empAccidentcases.getSettleStatus() != null && empAccidentcases.getSettleStatus() != 0) {
            queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empAccidentcases.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
    @Override
    public IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
        QueryWrapper<EmpAccidentCases> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empAccidentcases.getDelFlag());
        if (StringUtils.isNotBlank(empAccidentcases.getEmpNumb())) {
            queryWrapper.like("a.EmpNumb", empAccidentcases.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getEmpName())) {
            queryWrapper.like("a.EmpName", empAccidentcases.getEmpName());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getCertificateNumb())) {
            queryWrapper.like("a.CertificateNumb", empAccidentcases.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getDeptName())) {
            queryWrapper.like("b.allDeptName", empAccidentcases.getDeptName());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getInjuredTimeStr())) {
            queryWrapper.between("a.InjuredTime", empAccidentcases.getInjuredTimeStr().split(",")[0],
                    empAccidentcases.getInjuredTimeStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empAccidentcases.getHrDoDateStr())) {
            queryWrapper.between("a.HrDoDate", empAccidentcases.getHrDoDateStr().split(",")[0],
                    empAccidentcases.getHrDoDateStr().split(",")[1]);
        }
        if (empAccidentcases.getHospitalizatioFlag() != null && empAccidentcases.getHospitalizatioFlag() != 0) {
            queryWrapper.eq("a.HospitalizatioFlag", empAccidentcases.getHospitalizatioFlag());
        }
        if (empAccidentcases.getSettleStatus() != null && empAccidentcases.getSettleStatus() != 0) {
            queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empAccidentcases.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

        Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
        Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "injuredTime", FebsConstant.ORDER_ASC, true);
        return empAccidentcasesMapper.selectPageVo(page, queryWrapper);
    }
        return empAccidentcasesMapper.selectPageVo(page, queryWrapper);
    }

    @Override
    public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
        LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpAccidentCases::getDelFlag, empAccidentcases.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
    }
    @Override
    public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
        LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpAccidentCases::getDelFlag, empAccidentcases.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
        LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
        lambdaQueryWrapper.eq(EmpAccidentCases::getInjuredTime, empAccidentcases.getInjuredTime());
        lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if (empAccidentcases.getReprotTime() == null) {
            empAccidentcases.setReprotTime(empAccidentcases.getInjuredTime());
        }
        if (empAccidentcases.getSubmitTime() == null) {
            empAccidentcases.setSubmitTime(empAccidentcases.getInjuredTime());
        }
        if (empAccidentcases.getHrDoDate() == null) {
            empAccidentcases.setHrDoDate(empAccidentcases.getInjuredTime());
        }
        empAccidentcases.setCreator(operatorId);
        empAccidentcases.setModifier(operatorId);
        this.save(empAccidentcases);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
        LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
        lambdaQueryWrapper.eq(EmpAccidentCases::getInjuredTime, empAccidentcases.getInjuredTime());
        lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag, 1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if (empAccidentcases.getReprotTime() == null) {
            empAccidentcases.setReprotTime(empAccidentcases.getInjuredTime());
        }
        if (empAccidentcases.getSubmitTime() == null) {
            empAccidentcases.setSubmitTime(empAccidentcases.getInjuredTime());
        }
        if (empAccidentcases.getHrDoDate() == null) {
            empAccidentcases.setHrDoDate(empAccidentcases.getInjuredTime());
        }
        empAccidentcases.setCreator(operatorId);
        empAccidentcases.setModifier(operatorId);
        this.save(empAccidentcases);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
        LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
        lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
        lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpAccidentCases::getAccidentId,empAccidentcases.getAccidentId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
        empAccidentcases.setCreateTime(dbData.getCreateTime());
        empAccidentcases.setCreator(dbData.getCreator());
        empAccidentcases.setDelFlag(dbData.getDelFlag());
        empAccidentcases.setModifyTime(new Date());
        empAccidentcases.setModifier(operatorId);
        this.saveOrUpdate(empAccidentcases);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
        LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
        lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
        lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag, 1);
        lambdaQueryWrapper.ne(EmpAccidentCases::getAccidentId, empAccidentcases.getAccidentId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
        empAccidentcases.setCreateTime(dbData.getCreateTime());
        empAccidentcases.setCreator(dbData.getCreator());
        empAccidentcases.setDelFlag(dbData.getDelFlag());
        empAccidentcases.setModifyTime(new Date());
        empAccidentcases.setModifier(operatorId);
        this.saveOrUpdate(empAccidentcases);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) {
        LambdaQueryWrapper<EmpAccidentCases> wrapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) {
        LambdaQueryWrapper<EmpAccidentCases> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
        this.remove(wrapper);
    }
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpAccidentCases(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empAccidentcasesMapper.logicDeleteByIds(list, operatorId);
    }
    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpAccidentCases(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empAccidentcasesMapper.logicDeleteByIds(list, operatorId);
    }

    @Override
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empAccidentcasesMapper.momentToNormal(list, operatorId) > 0;
    }
    @Override
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empAccidentcasesMapper.momentToNormal(list, operatorId) > 0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpAccidentCases(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
            EmpAccidentCases empAccidentcases=new EmpAccidentCases();
            empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empAccidentcases.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()));
                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;
            }
            empAccidentcases.setDelFlag(0);
            empAccidentcases.setEmpId(empBaseInfo.getEmpId());
            empAccidentcases.setDeptName(list.get(1).toString());
            empAccidentcases.setDeptId(dept.getDeptId());
            empAccidentcases.setJobName(list.get(2).toString());
            empAccidentcases.setEmpName(list.get(3).toString());
            empAccidentcases.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empAccidentcases.setInjuredTime(DateUtil.parseDateTime(list.get(5).toString()));
            }
            empAccidentcases.setInjuredAddress(list.get(6).toString());
            empAccidentcases.setInjuredPart(list.get(7).toString());
            empAccidentcases.setInjuredDescribe(list.get(8).toString());
            empAccidentcases.setInjuredDiacrisis(list.get(9).toString());
            empAccidentcases.setHospitalName(list.get(10).toString());
            empAccidentcases.setTreatmentName(list.get(11).toString());
            if (StringUtils.isNotBlank(list.get(12).toString())) {
                empAccidentcases.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(13).toString())) {
                empAccidentcases.setBedNumb(list.get(13).toString());
            }
            if (StringUtils.isNotBlank(list.get(14).toString())) {
                empAccidentcases.setReprotTime(DateUtil.parseDate(list.get(14).toString()));
            }
            if (StringUtils.isNotBlank(list.get(15).toString())) {
                empAccidentcases.setSubmitTime(DateUtil.parseDate(list.get(15).toString()));
            }
            empAccidentcases.setSbumitBy(list.get(16).toString());
            if (StringUtils.isNotBlank(list.get(17).toString())) {
                empAccidentcases.setExpensesFee(new BigDecimal(list.get(17).toString()));
            }
            if (StringUtils.isNotBlank(list.get(18).toString())) {
                empAccidentcases.setInnsureFee(new BigDecimal(list.get(18).toString()));
            }
            empAccidentcases.setExpenseReport(list.get(19).toString());
            if (StringUtils.isNotBlank(list.get(20).toString())) {
                empAccidentcases.setHrDoDate(DateUtil.parseDate(list.get(20).toString()));
            }
            if (StringUtils.isNotBlank(list.get(21).toString())) {
                empAccidentcases.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(22).toString())) {
                empAccidentcases.setSettleDate(DateUtil.parseDate(list.get(22).toString()));
            }
            empAccidentcases.setEmpStatus(empBaseInfo.getEmpStatus());
            this.save(empAccidentcases);
        }
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpAccidentCases(List<List<Object>> listObject, List<String> returnList) {
        for (List<Object> list : listObject) {
            if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
                continue;
            }
            EmpAccidentCases empAccidentcases = new EmpAccidentCases();
            empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empAccidentcases.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()));
                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;
            }
            empAccidentcases.setDelFlag(0);
            empAccidentcases.setEmpId(empBaseInfo.getEmpId());
            empAccidentcases.setDeptName(list.get(1).toString());
            empAccidentcases.setDeptId(dept.getDeptId());
            empAccidentcases.setJobName(list.get(2).toString());
            empAccidentcases.setEmpName(list.get(3).toString());
            empAccidentcases.setCertificateNumb(list.get(4).toString());

            empAccidentcases.setInjuredAddress(list.get(6).toString());
            empAccidentcases.setInjuredPart(list.get(7).toString());
            empAccidentcases.setInjuredDescribe(list.get(8).toString());
            empAccidentcases.setInjuredDiacrisis(list.get(9).toString());
            empAccidentcases.setHospitalName(list.get(10).toString());
            empAccidentcases.setTreatmentName(list.get(11).toString());
            if (StringUtils.isNotBlank(list.get(12).toString())) {
                empAccidentcases.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(13).toString())) {
                empAccidentcases.setBedNumb(list.get(13).toString());
            }
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empAccidentcases.setInjuredTime(DateUtil.parse(list.get(5).toString()));
                }
                if (StringUtils.isNotBlank(list.get(14).toString())) {
                    empAccidentcases.setReprotTime(DateUtil.parse(list.get(14).toString()));
                }
                if (StringUtils.isNotBlank(list.get(15).toString())) {
                    empAccidentcases.setSubmitTime(DateUtil.parse(list.get(15).toString()));
                }
                if (StringUtils.isNotBlank(list.get(20).toString())) {
                    empAccidentcases.setHrDoDate(DateUtil.parse(list.get(20).toString()));
                }
                if (StringUtils.isNotBlank(list.get(22).toString())) {
                    empAccidentcases.setSettleDate(DateUtil.parse(list.get(22).toString()));
                }
            } catch (Exception e) {
                returnList.add(StrUtil.format("导入员工意外险案件异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
                continue;
            }
            empAccidentcases.setSbumitBy(list.get(16).toString());
            if (StringUtils.isNotBlank(list.get(17).toString())) {
                empAccidentcases.setExpensesFee(new BigDecimal(list.get(17).toString()));
            }
            if (StringUtils.isNotBlank(list.get(18).toString())) {
                empAccidentcases.setInnsureFee(new BigDecimal(list.get(18).toString()));
            }
            empAccidentcases.setExpenseReport(list.get(19).toString());

            if (StringUtils.isNotBlank(list.get(21).toString())) {
                empAccidentcases.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
            }

            empAccidentcases.setEmpStatus(empBaseInfo.getEmpStatus());
            this.save(empAccidentcases);
        }
    }


}

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

@@ -1,37 +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.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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.*;

@@ -194,9 +191,15 @@
            empBadrecord.setJobName(list.get(2).toString());
            empBadrecord.setEmpName(list.get(3).toString());
            empBadrecord.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empBadrecord.setBadDate(DateUtil.parseDateTime(list.get(5).toString()));
            }
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empBadrecord.setBadDate(DateUtil.parse(list.get(5).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            empBadrecord.setBadContent(list.get(6).toString());
            empBadrecord.setReporter(list.get(7).toString());
            empBadrecord.setRemark(list.get(8).toString());

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

@@ -536,7 +536,7 @@
            }

            if (StringUtils.isNotBlank(list.get(11).toString())) {
                empBaseInfo.setEntryDate(DateUtil.parseDate(list.get(11).toString()));
                empBaseInfo.setEntryDate(DateUtil.parse(list.get(11).toString()));
            }

            //最高学历

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

@@ -1,42 +1,36 @@
package cc.mrbird.febs.server.hr.service.impl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
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.entity.system.DicItem;
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.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
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.Propagation;
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.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import cn.hutool.core.date.DateUtil;
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.*;

/**
 * name:EmpContractinfo
@@ -206,16 +200,22 @@
            contractInfo.setJobName(list.get(2).toString());
            contractInfo.setEmpName(list.get(3).toString());
            contractInfo.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                contractInfo.setSigningDate(DateUtil.parseDate(list.get(5).toString()));
            }
            if (StringUtils.isNotBlank(list.get(6).toString())) {
                contractInfo.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    contractInfo.setSigningDate(DateUtil.parse(list.get(5).toString()));
                }
                if (StringUtils.isNotBlank(list.get(6).toString())) {
                    contractInfo.setBeginDate(DateUtil.parse(list.get(6).toString()));
                }

                if (StringUtils.isNotBlank(list.get(7).toString())) {
                    contractInfo.setEndDate(DateUtil.parse(list.get(7).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            if (StringUtils.isNotBlank(list.get(7).toString())) {
                contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
            }
            if (StringUtils.isNotBlank(list.get(8).toString())) {
                contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
            }

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

@@ -1,35 +1,33 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;

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.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.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.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
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 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.math.BigDecimal;
import java.util.*;
@@ -181,8 +179,14 @@
            dimissionAttend.setJobName(list.get(2).toString());
            dimissionAttend.setEmpName(list.get(3).toString());
            dimissionAttend.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())){
                dimissionAttend.setAttendMonth(DateUtil.formatDate(DateUtil.parse(list.get(5).toString())));
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())){
                    dimissionAttend.setAttendMonth(DateUtil.formatDate(DateUtil.parse(list.get(5).toString())));
                }

            }catch (Exception e){
                returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            if (StringUtils.isNotBlank(list.get(6).toString())) {

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

@@ -210,9 +210,15 @@
            empInsurance.setJobName(list.get(2).toString());
            empInsurance.setEmpName(list.get(3).toString());
            empInsurance.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empInsurance.setApplayDate(DateUtil.parse(list.get(5).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            empInsurance.setProposer(list.get(6).toString());
            //社保档位
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"INSURANCETYPE")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);

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

@@ -51,51 +51,51 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpLaborTroubleServiceImpl extends ServiceImpl<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {

    private final RedisService redisService;
    private final RedisService redisService;
    private final EmpLaborTroubleMapper empLabortroubleMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
    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<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
        QueryWrapper<EmpLaborTrouble> queryWrapper = new QueryWrapper<>();
        QueryWrapper<EmpLaborTrouble> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empLabortrouble.getDelFlag());
        if (StringUtils.isNotBlank(empLabortrouble.getEmpNumb())) {
            queryWrapper.like("a.EmpNumb", empLabortrouble.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
            queryWrapper.like("a.EmpName", empLabortrouble.getEmpName());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
            queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
            queryWrapper.like("b.allDeptName", empLabortrouble.getDeptName());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
            queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
                    empLabortrouble.getArbitrationDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
            queryWrapper.between("a.SettleDate", empLabortrouble.getSettleDateStr().split(",")[0],
                    empLabortrouble.getSettleDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
            queryWrapper.eq("a.ArbitrationType", empLabortrouble.getArbitrationType());
        }
        if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
            queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
            queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
            queryWrapper.like("a.EmpNumb", empLabortrouble.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
            queryWrapper.like("a.EmpName", empLabortrouble.getEmpName());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
            queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
            queryWrapper.like("b.allDeptName", empLabortrouble.getDeptName());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
            queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
                    empLabortrouble.getArbitrationDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
            queryWrapper.between("a.SettleDate", empLabortrouble.getSettleDateStr().split(",")[0],
                    empLabortrouble.getSettleDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
            queryWrapper.eq("a.ArbitrationType", empLabortrouble.getArbitrationType());
        }
        if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
            queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
            queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "arbitrationDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
@@ -113,13 +113,13 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
        LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
        lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
        lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag, 1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empLabortrouble.setCreator(operatorId);
        empLabortrouble.setModifier(operatorId);
@@ -129,14 +129,14 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
        LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
        lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId,empLabortrouble.getArbitrationId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
        lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag, 1);
        lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId, empLabortrouble.getArbitrationId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
        empLabortrouble.setCreateTime(dbData.getCreateTime());
        empLabortrouble.setCreator(dbData.getCreator());
@@ -175,69 +175,76 @@
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empLabortroubleMapper.momentToNormal(list, operatorId)>0;
        return empLabortroubleMapper.momentToNormal(list, operatorId) > 0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
        for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
            EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
            empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empLabortrouble.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()));
                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;
            }
            empLabortrouble.setDelFlag(0);
            empLabortrouble.setEmpId(empBaseInfo.getEmpId());
            empLabortrouble.setDeptName(list.get(1).toString());
            empLabortrouble.setDeptId(dept.getDeptId());
            empLabortrouble.setJobName(list.get(2).toString());
            empLabortrouble.setEmpName(list.get(3).toString());
            empLabortrouble.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
            }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpLaborTrouble(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
        for (List<Object> list : listObject) {
            if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
                continue;
            }
            EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
            empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empLabortrouble.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()));
                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;
            }
            empLabortrouble.setDelFlag(0);
            empLabortrouble.setEmpId(empBaseInfo.getEmpId());
            empLabortrouble.setDeptName(list.get(1).toString());
            empLabortrouble.setDeptId(dept.getDeptId());
            empLabortrouble.setJobName(list.get(2).toString());
            empLabortrouble.setEmpName(list.get(3).toString());
            empLabortrouble.setCertificateNumb(list.get(4).toString());

            //仲裁类型
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"zctype")&&StrUtil.equals(j.getDicItemName(),list.get(6).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
            }
            //仲裁类型
            DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "zctype") && StrUtil.equals(j.getDicItemName(), list.get(6).toString())).findFirst().orElse(null);
            if (null != dicItem) {
                empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
            }


            empLabortrouble.setArbitrationReason(list.get(7).toString());
            empLabortrouble.setReporter(list.get(8).toString());
            empLabortrouble.setRemark(list.get(9).toString());
            if (StringUtils.isNotBlank(list.get(10).toString())) {
                empLabortrouble.setArbitrationPay(new BigDecimal(list.get(10).toString()));
            }
            if (StringUtils.isNotBlank(list.get(11).toString())) {
                empLabortrouble.setArbitrationStatus("未结案".equals(list.get(11).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(12).toString())) {
                empLabortrouble.setSettleDate(DateUtil.parseDate(list.get(12).toString()));
            }
            empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
            this.save(empLabortrouble);
        }
    }
            empLabortrouble.setArbitrationReason(list.get(7).toString());
            empLabortrouble.setReporter(list.get(8).toString());
            empLabortrouble.setRemark(list.get(9).toString());
            if (StringUtils.isNotBlank(list.get(10).toString())) {
                empLabortrouble.setArbitrationPay(new BigDecimal(list.get(10).toString()));
            }
            if (StringUtils.isNotBlank(list.get(11).toString())) {
                empLabortrouble.setArbitrationStatus("未结案".equals(list.get(11).toString()) ? 0 : 1);
            }
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empLabortrouble.setArbitrationDate(DateUtil.parse(list.get(5).toString()));
                }

    private List<EmpLaborTrouble> convertDicItemName(List<EmpLaborTrouble> list){
                if (StringUtils.isNotBlank(list.get(12).toString())) {
                    empLabortrouble.setSettleDate(DateUtil.parse(list.get(12).toString()));
                }
            } catch (Exception e) {
                returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
                continue;
            }

            empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
            this.save(empLabortrouble);
        }
    }

    private List<EmpLaborTrouble> convertDicItemName(List<EmpLaborTrouble> list) {
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            //仲裁类型
@@ -248,6 +255,6 @@
                    .orElse(""));
        });

        return  list;
        return list;
    }
}

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

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

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.utils.SortUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
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.DicCode;
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.entity.system.DicItem;
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.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
@@ -38,7 +20,19 @@
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
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 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.math.BigDecimal;
import java.util.*;

/**
 * name:EmpLeaveinfo
@@ -184,12 +178,22 @@
            leaveInfo.setJobName(list.get(2).toString());
            leaveInfo.setEmpName(list.get(3).toString());
            leaveInfo.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                leaveInfo.setBeginTime(DateUtil.parseDate(list.get(5).toString()));
            }
            if (StringUtils.isNotBlank(list.get(6).toString())) {
                leaveInfo.setEndTime(DateUtil.parseDate(list.get(6).toString()));
            }
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    leaveInfo.setBeginTime(DateUtil.parse(list.get(5).toString()));
                }
                if (StringUtils.isNotBlank(list.get(6).toString())) {
                    leaveInfo.setEndTime(DateUtil.parse(list.get(6).toString()));
                }

                if (StringUtils.isNotBlank(list.get(9).toString())) {
                    leaveInfo.setReturnDate(DateUtil.parse(list.get(9).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            if (StringUtils.isNotBlank(list.get(7).toString())) {
                leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
            }
@@ -199,9 +203,6 @@
                leaveInfo.setLeaveType(dicItem.getDicItemCode());
            }

            if (StringUtils.isNotBlank(list.get(9).toString())) {
                leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
            }
            leaveInfo.setReporter(list.get(10).toString());
            leaveInfo.setRemark(list.get(11).toString());
            leaveInfo.setEmpStatus(empBaseInfo.getEmpStatus());

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

@@ -1,47 +1,40 @@
package cc.mrbird.febs.server.hr.service.impl;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
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.entity.system.DicItem;
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.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
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.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
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.Propagation;
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;
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.math.BigDecimal;
import java.util.*;

/**
 * name:EmpOccupational
@@ -57,48 +50,48 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {

    private final RedisService redisService;
    private final RedisService redisService;
    private final EmpOccupationalMapper empOccupationalMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
    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) {
        QueryWrapper<EmpOccupational> queryWrapper = new QueryWrapper<>();
        QueryWrapper<EmpOccupational> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empOccupational.getDelFlag());
        if (StringUtils.isNotBlank(empOccupational.getEmpNumb())) {
            queryWrapper.like("a.EmpNumb", empOccupational.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
            queryWrapper.like("a.EmpName", empOccupational.getEmpName());
        }
        if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
            queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
            queryWrapper.like("b.allDeptName", empOccupational.getDeptName());
        }
        if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
            queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
                    empOccupational.getInjuredTimeStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
            queryWrapper.between("a.HrDoDate", empOccupational.getHrDoDateStr().split(",")[0],
                    empOccupational.getHrDoDateStr().split(",")[1]);
        }
        if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
            queryWrapper.eq("a.HospitalizatioFlag", empOccupational.getHospitalizatioFlag());
        }
        if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
            queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
        }
        if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
            queryWrapper.like("a.EmpNumb", empOccupational.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
            queryWrapper.like("a.EmpName", empOccupational.getEmpName());
        }
        if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
            queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
            queryWrapper.like("b.allDeptName", empOccupational.getDeptName());
        }
        if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
            queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
                    empOccupational.getInjuredTimeStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
            queryWrapper.between("a.HrDoDate", empOccupational.getHrDoDateStr().split(",")[0],
                    empOccupational.getHrDoDateStr().split(",")[1]);
        }
        if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
            queryWrapper.eq("a.HospitalizatioFlag", empOccupational.getHospitalizatioFlag());
        }
        if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
            queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
        }
        if (StringUtils.isNotBlank(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());
        SortUtil.handlePageSort(request, page, "injuredTime", FebsConstant.ORDER_ASC, true);
        IPage<EmpOccupational> pageList = empOccupationalMapper.selectPageVo(page, queryWrapper);
@@ -122,19 +115,19 @@
        LambdaQueryWrapper<EmpOccupational> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpOccupational::getEmpId, empOccupational.getEmpId());
        lambdaQueryWrapper.eq(EmpOccupational::getInjuredTime, empOccupational.getInjuredTime());
        lambdaQueryWrapper.ne(EmpOccupational::getDelFlag,1);
        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){
        if (empOccupational.getSubmitTime() == null) {
            empOccupational.setSubmitTime(empOccupational.getInjuredTime());
        }
        if(empOccupational.getReportTime()==null){
        if (empOccupational.getReportTime() == null) {
            empOccupational.setReportTime(empOccupational.getInjuredTime());
        }
        if(empOccupational.getHrDoDate()==null){
        if (empOccupational.getHrDoDate() == null) {
            empOccupational.setHrDoDate(empOccupational.getInjuredTime());
        }
        empOccupational.setCreator(operatorId);
@@ -183,84 +176,94 @@
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empOccupationalMapper.momentToNormal(list, operatorId)>0;
        return empOccupationalMapper.momentToNormal(list, operatorId) > 0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpOccupational(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
            EmpOccupational empOccupational=new EmpOccupational();
            empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empOccupational.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()));
                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(0);
            empOccupational.setEmpId(empBaseInfo.getEmpId());
            empOccupational.setDeptName(list.get(1).toString());
            empOccupational.setDeptId(dept.getDeptId());
            empOccupational.setJobName(list.get(2).toString());
            empOccupational.setEmpName(list.get(3).toString());
            empOccupational.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empOccupational.setInjuredTime(DateUtil.parseDateTime(list.get(5).toString()));
            }
            empOccupational.setInjuredAddress(list.get(6).toString());
            empOccupational.setInjuredPart(list.get(7).toString());
            empOccupational.setInjuredDescribe(list.get(8).toString());
            empOccupational.setInjuredDiacrisis(list.get(9).toString());
            empOccupational.setHospitalName(list.get(10).toString());
            empOccupational.setTreatmentName(list.get(11).toString());
            if (StringUtils.isNotBlank(list.get(12).toString())) {
                empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(13).toString())) {
                empOccupational.setBedNumb(list.get(13).toString());
            }
            if (StringUtils.isNotBlank(list.get(14).toString())) {
                empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));
            }
            if (StringUtils.isNotBlank(list.get(15).toString())) {
                empOccupational.setSubmitTime(DateUtil.parseDate(list.get(15).toString()));
            }
            empOccupational.setSbumitBy(list.get(16).toString());
            if (StringUtils.isNotBlank(list.get(17).toString())) {
                empOccupational.setExpensesFee(new BigDecimal(list.get(17).toString()));
            }
            if (StringUtils.isNotBlank(list.get(18).toString())) {
                empOccupational.setCompensated(new BigDecimal(list.get(18).toString()));
            }
            empOccupational.setExpenseReport(list.get(19).toString());
            if (StringUtils.isNotBlank(list.get(20).toString())) {
                empOccupational.setHrDoDate(DateUtil.parseDate(list.get(20).toString()));
            }
            if (StringUtils.isNotBlank(list.get(21).toString())) {
                empOccupational.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(22).toString())) {
                empOccupational.setSettleDate(DateUtil.parseDate(list.get(22).toString()));
            }
            empOccupational.setEmpStatus(empBaseInfo.getEmpStatus());
            this.save(empOccupational);
        }
    @Transactional(rollbackFor = Exception.class)
    public void importEmpOccupational(List<List<Object>> listObject, List<String> returnList) {
        for (List<Object> list : listObject) {
            if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
                continue;
            }
            EmpOccupational empOccupational = new EmpOccupational();
            empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empOccupational.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()));
                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(0);
            empOccupational.setEmpId(empBaseInfo.getEmpId());
            empOccupational.setDeptName(list.get(1).toString());
            empOccupational.setDeptId(dept.getDeptId());
            empOccupational.setJobName(list.get(2).toString());
            empOccupational.setEmpName(list.get(3).toString());
            empOccupational.setCertificateNumb(list.get(4).toString());

            empOccupational.setInjuredAddress(list.get(6).toString());
            empOccupational.setInjuredPart(list.get(7).toString());
            empOccupational.setInjuredDescribe(list.get(8).toString());
            empOccupational.setInjuredDiacrisis(list.get(9).toString());
            empOccupational.setHospitalName(list.get(10).toString());
            empOccupational.setTreatmentName(list.get(11).toString());
            if (StringUtils.isNotBlank(list.get(12).toString())) {
                empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(13).toString())) {
                empOccupational.setBedNumb(list.get(13).toString());
            }
            try {


                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empOccupational.setInjuredTime(DateUtil.parse(list.get(5).toString()));
                }
                if (StringUtils.isNotBlank(list.get(14).toString())) {
                    empOccupational.setReportTime(DateUtil.parse(list.get(14).toString()));
                }
                if (StringUtils.isNotBlank(list.get(15).toString())) {
                    empOccupational.setSubmitTime(DateUtil.parse(list.get(15).toString()));
                }
                if (StringUtils.isNotBlank(list.get(20).toString())) {
                    empOccupational.setHrDoDate(DateUtil.parse(list.get(20).toString()));
                }
                if (StringUtils.isNotBlank(list.get(22).toString())) {
                    empOccupational.setSettleDate(DateUtil.parse(list.get(22).toString()));
                }
            } catch (Exception e) {
                returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
                continue;
            }
            empOccupational.setSbumitBy(list.get(16).toString());
            if (StringUtils.isNotBlank(list.get(17).toString())) {
                empOccupational.setExpensesFee(new BigDecimal(list.get(17).toString()));
            }
            if (StringUtils.isNotBlank(list.get(18).toString())) {
                empOccupational.setCompensated(new BigDecimal(list.get(18).toString()));
            }
            empOccupational.setExpenseReport(list.get(19).toString());

            if (StringUtils.isNotBlank(list.get(21).toString())) {
                empOccupational.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
            }

            empOccupational.setEmpStatus(empBaseInfo.getEmpStatus());
            this.save(empOccupational);
        }
    }

    private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list){
    private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list) {
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.parallelStream().forEachOrdered(p -> {
            // 设置结案状态

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

@@ -1,43 +1,36 @@
package cc.mrbird.febs.server.hr.service.impl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
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.entity.system.DicItem;
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.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
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.Propagation;
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.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
import cn.hutool.core.date.DateUtil;
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.*;

/**
 * name:EmpPhysicalexam
@@ -214,9 +207,15 @@
            physicalExam.setCertificateNumb(list.get(4).toString());
            physicalExam.setSex(list.get(5).toString());
            physicalExam.setHospital(list.get(6).toString());
            if (StringUtils.isNotBlank(list.get(7).toString())) {
                physicalExam.setPhysicalExamDate(DateUtil.parseDate(list.get(7).toString()));
            }
            try {
                if (StringUtils.isNotBlank(list.get(7).toString())) {
                    physicalExam.setPhysicalExamDate(DateUtil.parse(list.get(7).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            //体检
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"physicalExamType")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){

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

@@ -1,35 +1,32 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
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.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.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.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
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 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.*;

@@ -182,9 +179,15 @@
            empRemarkinfo.setJobName(list.get(2).toString());
            empRemarkinfo.setEmpName(list.get(3).toString());
            empRemarkinfo.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empRemarkinfo.setRemarkDate(DateUtil.parseDateTime(list.get(5).toString()));
            }
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empRemarkinfo.setRemarkDate(DateUtil.parse(list.get(5).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            empRemarkinfo.setRemarkContent(list.get(6).toString());
            this.save(empRemarkinfo);
        }

 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.*;

@@ -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());

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

@@ -53,7 +53,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpUnemploymentServiceImpl extends ServiceImpl<EmpUnemploymentMapper, EmpUnemployment> implements IEmpUnemploymentService {

    private final RedisService redisService;
    private final RedisService redisService;
    private final EmpUnemploymentMapper empUnemploymentMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
@@ -63,7 +63,7 @@

    @Override
    public IPage<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment) {
        QueryWrapper<EmpUnemployment> queryWrapper = new QueryWrapper<>();
        QueryWrapper<EmpUnemployment> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empUnemployment.getDelFlag());
        if (StringUtils.isNotBlank(empUnemployment.getEmpNumb())) {
            queryWrapper.like("a.EmpNumb", empUnemployment.getEmpNumb());
@@ -78,7 +78,7 @@
            queryWrapper.like("b.allDeptName", empUnemployment.getDeptName());
        }
        if (StringUtils.isNotBlank(empUnemployment.getApplayDateStr())) {
            queryWrapper.between("a.ApplayDate", 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("a.ApplayReason", empUnemployment.getApplayReason());
@@ -104,8 +104,8 @@
    public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate() );
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag, 1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
@@ -121,8 +121,8 @@
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag, 1);
        lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId, empUnemployment.getUnemploymentId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
@@ -164,49 +164,55 @@
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empUnemploymentMapper.momentToNormal(list, operatorId)>0;
        return empUnemploymentMapper.momentToNormal(list, operatorId) > 0;
    }


    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpUnemployment(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
    @Transactional(rollbackFor = Exception.class)
    public void importEmpUnemployment(List<List<Object>> listObject, List<String> returnList) {
        for (List<Object> list : listObject) {
            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();
            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()));
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(1).toString()));
                continue;
            }
            Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
            if (null == empId){
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
            if (null == empId) {
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}员工编号不存在", listObject.indexOf(list) + 1, list.get(0).toString()));
                continue;
            }
            empUnemployment.setDelFlag(0);
            empUnemployment.setEmpId(empId);
            empUnemployment.setDeptName(list.get(1).toString());
            empUnemployment.setDeptId(dept.getDeptId());
            empUnemployment.setJobName(list.get(2).toString());
            empUnemployment.setEmpName(list.get(3).toString());
            empUnemployment.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empUnemployment.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
            }
            empUnemployment.setApplayReason(list.get(6).toString());
            empUnemployment.setReporter(list.get(7).toString());
            empUnemployment.setAuditor(list.get(8).toString());
            empUnemployment.setRemark(list.get(9).toString());
            this.save(empUnemployment);
        }
    }
            empUnemployment.setDeptName(list.get(1).toString());
            empUnemployment.setDeptId(dept.getDeptId());
            empUnemployment.setJobName(list.get(2).toString());
            empUnemployment.setEmpName(list.get(3).toString());
            empUnemployment.setCertificateNumb(list.get(4).toString());
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empUnemployment.setApplayDate(DateUtil.parse(list.get(5).toString()));
                }
            } catch (Exception e) {
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
                continue;
            }

            empUnemployment.setApplayReason(list.get(6).toString());
            empUnemployment.setReporter(list.get(7).toString());
            empUnemployment.setAuditor(list.get(8).toString());
            empUnemployment.setRemark(list.get(9).toString());
            this.save(empUnemployment);
        }
    }
}

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

@@ -1,10 +1,10 @@
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.system.Dept;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
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;
@@ -16,20 +16,17 @@
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
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 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.*;

@@ -187,12 +184,18 @@
            workExperience.setCertificateNumb(list.get(2).toString());
            workExperience.setSex(list.get(3).toString());
            workExperience.setWorkUnit(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
            }
            if (StringUtils.isNotBlank(list.get(6).toString())) {
                workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
            }
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    workExperience.setBeginDate(DateUtil.parse(list.get(5).toString()));
                }
                if (StringUtils.isNotBlank(list.get(6).toString())) {
                    workExperience.setEndDate(DateUtil.parse(list.get(6).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            workExperience.setJobContent(list.get(7).toString());
            workExperience.setCreator(FebsUtil.getUserId());
            workExperience.setModifier(FebsUtil.getUserId());