feat: 监察统计 update 3

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysStatisticManager.java

@@ -405,12 +405,15 @@ public class SysStatisticManager {
 
 
             String serviceCompleteRate = "";
-            SysPlanPkg pp = planPkgService.getOne(Wrappers.<SysPlanPkg>lambdaQuery().eq(SysPlanPkg::getPlanId, plan.getPlanId()));
+            List<SysPlanPkg> pp = planPkgService.list(Wrappers.<SysPlanPkg>lambdaQuery().eq(SysPlanPkg::getPlanId, plan.getPlanId()));
+
+            if (CollUtil.isNotEmpty(pp)) {
+
+                List<String> collect1 = pp.stream().map(r -> r.getPkgId().toString()).distinct().sorted().collect(Collectors.toList());
 
-            if (pp != null) {
                 List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery()
                         .in(WmTask::getTaskStatus, UpmsState.TaskState.PASSED)
-                        .in(WmTask::getScorePackageId, pp.getPkgId().toString()));
+                        .in(WmTask::getScorePackageId, collect1));
 
                 if (CollUtil.isNotEmpty(tasks)) {
                     serviceCompleteRate = String.valueOf(tasks.stream().mapToInt(WmTask::getScore).sum());