Merge remote-tracking branch 'origin/master'

This commit is contained in:
2023-03-08 15:58:05 +08:00

View File

@@ -73,6 +73,9 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDis
issueesAndOrderVO.setId (orgNo);
issueesAndOrderVO.setIssueesCount (rStatDistributionProblemPOS.size ( ));
List<String> problemNoList = rStatDistributionProblemPOS.stream ( ).map (RStatDistributionProblemPO::getProblemNo).collect (Collectors.toList ( ));
if(CollectionUtils.isEmpty (problemNoList)){
issueesAndOrderVO.setRelatedOrderCount (0);
}else{
/*已关联工单数量*/
QueryWrapper<RStatWorkOrderDetailPO> workOrderDetailPOQueryWrapper = new QueryWrapper<> ( );
workOrderDetailPOQueryWrapper.select ("1").
@@ -80,6 +83,8 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDis
in ("org_no", deptIds);
Integer relatedOrderCount = rStatWorkOrderDetailMapper.selectCount (workOrderDetailPOQueryWrapper);
issueesAndOrderVO.setRelatedOrderCount (relatedOrderCount);
}
return issueesAndOrderVO;
}