修改bug

yz

2021-03-04 d81fca8baf1b14bfe372cb1e3d85c0afa7350db7

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

@@ -12,6 +12,8 @@
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -48,6 +50,7 @@

    private final RedisService redisService;
    private final EmpPhysicalExamMapper empPhysicalexamMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");
@@ -167,16 +170,30 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpPhysicalExam(List<List<Object>> listObject) {
   public void importEmpPhysicalExam(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
         EmpPhysicalExam physicalExam = new EmpPhysicalExam();
         physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         physicalExam.setEmpNumb(list.get(0).toString());
         physicalExam.setDeptName(list.get(1).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();
         physicalExam.setDeptId(deptId);
            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;
            }
            Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
            if (null == empId){
                returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            physicalExam.setDelFlag(2);
            physicalExam.setEmpId(empId);
            physicalExam.setDeptName(list.get(1).toString());
         physicalExam.setDeptId(dept.getDeptId());
         physicalExam.setJobName(list.get(2).toString());
         physicalExam.setEmpName(list.get(3).toString());
         physicalExam.setCertificateNumb(list.get(4).toString());
@@ -195,4 +212,4 @@
         this.save(physicalExam);
      }
   }
}
}