|
@@ -152,6 +152,15 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
|
public List<CheckJobVO> getCheckJobVO() {
|
|
|
CheckJobDTO checkJobDTO = new CheckJobDTO();
|
|
|
List<CheckJobVO> checkJobVOS = getJobVO(checkJobDTO);
|
|
|
+ Integer waitNum = 0;
|
|
|
+ Integer compaleteNum = 0;
|
|
|
+ for (CheckJobVO vo:checkJobVOS){
|
|
|
+ if (vo.getStatus()==1||vo.getStatus()==2){
|
|
|
+ waitNum++;
|
|
|
+ }else if (vo.getStatus()==3){
|
|
|
+ compaleteNum++;
|
|
|
+ }
|
|
|
+ }
|
|
|
List<String> sbIds = checkJobVOS.stream().map(CheckJobVO::getSbId).distinct().collect(Collectors.toList());
|
|
|
//查出所有的设备
|
|
|
if (sbIds==null||sbIds.size()==0){
|
|
@@ -160,6 +169,10 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
|
List<SbInfoVO> sbInfoVOS = sbInfoMapper.getByIds(sbIds);
|
|
|
List<String> positionIds = sbInfoVOS.stream().map(SbInfoVO::getPositionId).distinct().collect(Collectors.toList());
|
|
|
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).setCountNum(checkJobVOS.size());
|
|
|
return checkJobVOS1;
|
|
|
}
|
|
|
|