Browse Source

fix: 报告获取任务超限额 2

shc 7 months ago
parent
commit
1f0773021b

+ 3 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -1080,9 +1080,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
         }
 
         // 获取当前积分包的所有任务数
+        List<String> pIds = wmScorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getRelationScoreId, scorePackage.getId())).stream().map(WmScorePackage::getId).distinct().sorted().collect(Collectors.toList());
+
         List<Integer> tids = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
                         .eq(WmTask::getTaskStatus, "3")
-                        .eq(WmTask::getScorePackageId, scorePackage.getId())).stream()
+                        .in(WmTask::getScorePackageId, pIds)).stream()
                 .mapToInt(t -> Integer.parseInt(t.getId())).boxed().distinct().sorted().collect(Collectors.toList());
 
         List<SysCheckChainNodeCheckHistory> his = checkChainNodeCheckHistoryService.list(