fix(人力微服务):

yz

2021-05-28 511a66546a655c9e5b44317ca82ae60fe5f2bf0d

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