Merge remote-tracking branch 'origin/master'

yz

2021-03-07 b8d038947e66850f1a6ec1f93e1805ba33f6fdc0

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

@@ -79,7 +79,7 @@
            queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empDimissionattend.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empDimissionattend.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -162,13 +162,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;
            }
            dimissionAttend.setDelFlag(2);
            dimissionAttend.setEmpId(empId);
            dimissionAttend.setEmpId(empBaseInfo.getEmpId());
         dimissionAttend.setDeptName(list.get(1).toString());
         dimissionAttend.setDeptId(dept.getDeptId());
         dimissionAttend.setJobName(list.get(2).toString());
@@ -192,6 +192,7 @@
            dimissionAttend.setAbsenteeism(new BigDecimal(list.get(11).toString()));
         }
         dimissionAttend.setRemark(list.get(12).toString());
         dimissionAttend.setEmpStatus(empBaseInfo.getEmpStatus());
         this.save(dimissionAttend);
      }
   }