修改bug

yz_08

2021-05-13 28187d584b00856bb1961b7ce6ebd168ef1aded7

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

@@ -8,8 +8,10 @@
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
@@ -77,7 +79,7 @@
         queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
         queryWrapper.like("a.DeptName", empOccupational.getDeptName());
         queryWrapper.like("b.allDeptName", empOccupational.getDeptName());
      }
      if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
         queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
@@ -94,10 +96,11 @@
         queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
      }
      if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
         queryWrapper.eq("a.EmpStatus", 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);
        List<EmpOccupational> list = pageList.getRecords();
        //处理数据字典
@@ -187,13 +190,16 @@
   @Transactional(rollbackFor = Exception.class)
    public void importEmpOccupational(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
         if (list.size()==0){
         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()));
@@ -204,7 +210,7 @@
            returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
            continue;
         }
         empOccupational.setDelFlag(2);
         empOccupational.setDelFlag(0);
         empOccupational.setEmpId(empBaseInfo.getEmpId());
         empOccupational.setDeptName(list.get(1).toString());
         empOccupational.setDeptId(dept.getDeptId());