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
@@ -218,9 +210,7 @@
            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());
@@ -233,11 +223,25 @@
            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.parseDate(list.get(14).toString()));
                    empAccidentcases.setReprotTime(DateUtil.parse(list.get(14).toString()));
            }
            if (StringUtils.isNotBlank(list.get(15).toString())) {
                empAccidentcases.setSubmitTime(DateUtil.parseDate(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())) {
@@ -247,15 +251,11 @@
                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);
        }

 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());
            try {
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empBadrecord.setBadDate(DateUtil.parseDateTime(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());
            try {
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                contractInfo.setSigningDate(DateUtil.parseDate(list.get(5).toString()));
                    contractInfo.setSigningDate(DateUtil.parse(list.get(5).toString()));
            }
            if (StringUtils.isNotBlank(list.get(6).toString())) {
                contractInfo.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
                    contractInfo.setBeginDate(DateUtil.parse(list.get(6).toString()));
            }

            if (StringUtils.isNotBlank(list.get(7).toString())) {
                contractInfo.setEndDate(DateUtil.parseDate(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(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,10 +179,16 @@
            dimissionAttend.setJobName(list.get(2).toString());
            dimissionAttend.setEmpName(list.get(3).toString());
            dimissionAttend.setCertificateNumb(list.get(4).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())) {
                dimissionAttend.setAttendDays(new BigDecimal(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());
            try {
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empInsurance.setApplayDate(DateUtil.parseDate(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

@@ -209,9 +209,6 @@
            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()));
            }

            //仲裁类型
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"zctype")&&StrUtil.equals(j.getDicItemName(),list.get(6).toString())).findFirst().orElse(null);
@@ -229,9 +226,19 @@
            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()));
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empLabortrouble.setArbitrationDate(DateUtil.parse(list.get(5).toString()));
            }

                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);
        }

 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());
            try {
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                leaveInfo.setBeginTime(DateUtil.parseDate(list.get(5).toString()));
                    leaveInfo.setBeginTime(DateUtil.parse(list.get(5).toString()));
            }
            if (StringUtils.isNotBlank(list.get(6).toString())) {
                leaveInfo.setEndTime(DateUtil.parseDate(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
@@ -217,9 +210,7 @@
            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());
@@ -232,11 +223,27 @@
            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.parseDate(list.get(14).toString()));
                    empOccupational.setReportTime(DateUtil.parse(list.get(14).toString()));
            }
            if (StringUtils.isNotBlank(list.get(15).toString())) {
                empOccupational.setSubmitTime(DateUtil.parseDate(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())) {
@@ -246,15 +253,11 @@
                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);
        }

 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());
            try {
            if (StringUtils.isNotBlank(list.get(7).toString())) {
                physicalExam.setPhysicalExamDate(DateUtil.parseDate(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());
            try {
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empRemarkinfo.setRemarkDate(DateUtil.parseDateTime(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());
            try {
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                resign.setApplayDate(DateUtil.parseDate(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

@@ -199,9 +199,15 @@
            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.parseDate(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());

 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());
            try {
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
                    workExperience.setBeginDate(DateUtil.parse(list.get(5).toString()));
            }
            if (StringUtils.isNotBlank(list.get(6).toString())) {
                workExperience.setEndDate(DateUtil.parseDate(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());