|
|
@@ -1079,8 +1079,12 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
nodeId = 3;
|
|
|
}
|
|
|
|
|
|
+ // 获取当前积分包的所有任务数
|
|
|
+ List<Integer> tids = wmTaskService.list(Wrappers.<WmTask>lambdaQuery().eq(WmTask::getScorePackageId, scorePackage.getId())).stream().mapToInt(t -> Integer.parseInt(t.getId())).boxed().distinct().sorted().collect(Collectors.toList());
|
|
|
+
|
|
|
List<SysCheckChainNodeCheckHistory> his = checkChainNodeCheckHistoryService.list(
|
|
|
Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery()
|
|
|
+ .in(CollUtil.isNotEmpty(tids), SysCheckChainNodeCheckHistory::getTargetId, tids)
|
|
|
.eq(SysCheckChainNodeCheckHistory::getNodeId, nodeId));
|
|
|
Set<Integer> collect = his.stream().mapToInt(SysCheckChainNodeCheckHistory::getTargetId).boxed().collect(Collectors.toSet());
|
|
|
if (CollUtil.isNotEmpty(collect)) {
|
