Merge branch 'lybfix20210302'

luoyb

2021-03-02 f961867e0e1ca3251928b1134eb66549a6a89ee3

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -18,11 +19,15 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
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 cc.mrbird.febs.server.hr.entity.EmpOccupational;
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;

/**
@@ -39,6 +44,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {

   private final RedisService redisService;
    private final EmpOccupationalMapper empOccupationalMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
@@ -149,4 +155,61 @@
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empOccupationalMapper.momentToNormal(list, operatorId)>0;
    }

    @Override
   @Transactional(rollbackFor = Exception.class)
    public void importEmpOccupational(List<List<Object>> listObject) {
       for (List<Object> list : listObject) {
          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);
         Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
               .getDeptId();
         empOccupational.setDeptName(list.get(1).toString());
         empOccupational.setDeptId(deptId);
         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(14).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()));
         }
         this.save(empOccupational);
       }
    }
}