|
@@ -169,10 +169,20 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
List<SbInfoVO> sbInfoVOS = sbInfoMapper.getByIds(sbIds);
|
|
List<SbInfoVO> sbInfoVOS = sbInfoMapper.getByIds(sbIds);
|
|
List<String> positionIds = sbInfoVOS.stream().map(SbInfoVO::getPositionId).distinct().collect(Collectors.toList());
|
|
List<String> positionIds = sbInfoVOS.stream().map(SbInfoVO::getPositionId).distinct().collect(Collectors.toList());
|
|
List<CheckJobVO> checkJobVOS1 = sbPositionMapper.getByIds(positionIds);
|
|
List<CheckJobVO> checkJobVOS1 = sbPositionMapper.getByIds(positionIds);
|
|
- checkJobVOS1.get(0).setWaitNum(waitNum);
|
|
|
|
- checkJobVOS1.get(0).setSbNum(sbIds.size());
|
|
|
|
- checkJobVOS1.get(0).setCompaleteNum(compaleteNum);
|
|
|
|
- checkJobVOS1.get(0).setMonthNum(checkJobVOS.size());
|
|
|
|
|
|
+ if (checkJobVOS1!=null&&checkJobVOS1.size()>0) {
|
|
|
|
+ checkJobVOS1.get(0).setWaitNum(waitNum);
|
|
|
|
+ checkJobVOS1.get(0).setSbNum(sbIds.size());
|
|
|
|
+ checkJobVOS1.get(0).setCompaleteNum(compaleteNum);
|
|
|
|
+ checkJobVOS1.get(0).setMonthNum(checkJobVOS.size());
|
|
|
|
+ }else {
|
|
|
|
+ checkJobVOS1 = new ArrayList<>();
|
|
|
|
+ CheckJobVO vo = new CheckJobVO();
|
|
|
|
+ vo.setWaitNum(0);
|
|
|
|
+ vo.setSbNum(0);
|
|
|
|
+ vo.setCompaleteNum(compaleteNum);
|
|
|
|
+ vo.setMonthNum(checkJobVOS.size());
|
|
|
|
+ checkJobVOS1.add(vo);
|
|
|
|
+ }
|
|
return checkJobVOS1;
|
|
return checkJobVOS1;
|
|
}
|
|
}
|
|
|
|
|