Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-08 4e52cb2253af9a22571c7d0c239ee283178d2fd4

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

@@ -88,7 +88,7 @@
         queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
         queryWrapper.eq("a.EmpStatus", empLabortrouble.getEmpStatus());
         queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
      }
      if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
         queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
@@ -191,13 +191,13 @@
            returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
            continue;
         }
         Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
         if (null == empId){
         EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
         if (null == empBaseInfo){
            returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
            continue;
         }
         empLabortrouble.setDelFlag(2);
         empLabortrouble.setEmpId(empId);
         empLabortrouble.setEmpId(empBaseInfo.getEmpId());
         empLabortrouble.setDeptName(list.get(1).toString());
         empLabortrouble.setDeptId(dept.getDeptId());
         empLabortrouble.setJobName(list.get(2).toString());
@@ -219,6 +219,7 @@
         if (StringUtils.isNotBlank(list.get(12).toString())) {
            empLabortrouble.setSettleDate(DateUtil.parseDate(list.get(12).toString()));
         }
         empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
         this.save(empLabortrouble);
      }
   }