|
@@ -101,12 +101,17 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
|
public AbstractPageResultBean<CheckJobNum> getCheckNum(CheckStandardDTO dto, Integer pageNum, Integer pageSize) {
|
|
|
SbInfo info = new SbInfo();
|
|
|
info.setStatus(SbInfoStatusEnum.IN_USE.getValue());
|
|
|
- List<SbInfo> sbInfos = sbInfoMapper.select(info);
|
|
|
+ List<SbInfo> sbInfos = new ArrayList<>();
|
|
|
+ if (dto.getSbName()==null&&dto.getSbNo()==null) {
|
|
|
+ sbInfos = sbInfoMapper.select(info);
|
|
|
+
|
|
|
+ }
|
|
|
List<String> sbIdList = sbInfos.stream().map(SbInfo::getId).collect(Collectors.toList());
|
|
|
CheckStandardDTO standardDTO = new CheckStandardDTO();
|
|
|
standardDTO.setSbIdList(sbIdList);
|
|
|
standardDTO.setSbName(dto.getSbName());
|
|
|
standardDTO.setSbNo(dto.getSbNo());
|
|
|
+ standardDTO.setPeriodType(dto.getPeriodType());
|
|
|
List<Integer> statusList = new ArrayList<>();
|
|
|
statusList.add(1);
|
|
|
statusList.add(2);
|
|
@@ -149,8 +154,10 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- checkJobNum.setCount(num);
|
|
|
- checkJobNums.add(checkJobNum);
|
|
|
+ if (num.intValue()!=0) {
|
|
|
+ checkJobNum.setCount(num);
|
|
|
+ checkJobNums.add(checkJobNum);
|
|
|
+ }
|
|
|
}
|
|
|
AbstractPageResultBean<CheckJobNum> pageInfo = getPageInfo(pageNum,pageSize,checkJobNums);
|
|
|
return pageInfo;
|