|
|
@@ -1278,22 +1278,41 @@ public class WmSupervisionManager {
|
|
|
.sorted()
|
|
|
.collect(Collectors.toList()),
|
|
|
Collections.emptyList());
|
|
|
+
|
|
|
+ List<Integer> tIds =
|
|
|
+ tasks.stream()
|
|
|
+ .mapToInt(t -> Integer.parseInt(t.getId()))
|
|
|
+ .boxed()
|
|
|
+ .distinct()
|
|
|
+ .sorted()
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
// List<WmTask> tasks =
|
|
|
// taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId,
|
|
|
// pkgIds).eq(WmTask::getTaskStatus, "3"));
|
|
|
// 获取监察记录(不可编辑的是监察过的)
|
|
|
+ // List<WmTaskSupervision> supervisions =
|
|
|
+ // taskSupervisionService.list(
|
|
|
+ // Wrappers.<WmTaskSupervision>lambdaQuery()
|
|
|
+ // .eq(WmTaskSupervision::getModifiable, false)
|
|
|
+ // .in(WmTaskSupervision::getTaskId, tIds)
|
|
|
+ //// .in(
|
|
|
+ //// WmTaskSupervision::getPackageId,
|
|
|
+ //// pkgIds.stream()
|
|
|
+ //// .mapToInt(Integer::valueOf)
|
|
|
+ //// .boxed()
|
|
|
+ //// .sorted()
|
|
|
+ //// .distinct()
|
|
|
+ //// .collect(Collectors.toList()))
|
|
|
+ // );
|
|
|
+
|
|
|
List<WmTaskSupervision> supervisions =
|
|
|
- taskSupervisionService.list(
|
|
|
- Wrappers.<WmTaskSupervision>lambdaQuery()
|
|
|
- .eq(WmTaskSupervision::getModifiable, false)
|
|
|
- .in(
|
|
|
- WmTaskSupervision::getPackageId,
|
|
|
- pkgIds.stream()
|
|
|
- .mapToInt(Integer::valueOf)
|
|
|
- .boxed()
|
|
|
- .sorted()
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList())));
|
|
|
+ CollUtil.isEmpty(tIds)
|
|
|
+ ? Collections.emptyList()
|
|
|
+ : taskSupervisionService.list(
|
|
|
+ Wrappers.<WmTaskSupervision>lambdaQuery()
|
|
|
+ .eq(WmTaskSupervision::getModifiable, false)
|
|
|
+ .in(WmTaskSupervision::getTaskId, tIds));
|
|
|
|
|
|
Map<Integer, List<WmTaskSupervision>> roleId2SupMap =
|
|
|
supervisions.stream()
|
