fix--视频督察排名bug

src/main/java/com/biutag/supervision/constants/enums/DepartGroupEnum.java

@@ -13,7 +13,7 @@ public enum DepartGroupEnum {
 
     COUNTY_CITY_BUREAUS(3, "分县市局"),
     BUREAU_AFFILIATED(4, "局属单位"),
-    PCS(12, "派出所");
+    PCS(10, "派出所");
 
     private Integer id;
 

src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java

@@ -1504,16 +1504,23 @@ public class DatavServiceImpl implements DatavService {
         List<OrganizeProblemRankVo> policeVideoSuperviseProblemRankList = new ArrayList<>();
         List<OrganizeProblemRankVo> teamVideoSuperviseProblemRankList = new ArrayList<>();
         SupDepartQueryParam supDepartGroupParam = new SupDepartQueryParam();
-        supDepartGroupParam.setLevel("2");
+        supDepartGroupParam.setLevel("3");
+        supDepartGroupParam.setPid(request.getDepartId());
         List<SupDepart> supDepartList = supDepartResourceService.query(supDepartGroupParam);
-        Map<Boolean, List<SupDepart>> partitionedMap = supDepartList.stream()
+        // 派出所
-                .collect(Collectors.partitioningBy(one ->
+        List<SupDepart> pcsList = supDepartList.stream()
-                        request.getDepartId().equals(one.getPid()) &&
+                .filter(one -> StrUtil.isNotBlank(one.getStatisticsGroupId()))
-                                DepartGroupEnum.PCS.getId().equals(Integer.valueOf(one.getStatisticsGroupId()))
+                .filter(one -> DepartGroupEnum.PCS.getId().equals(Integer.valueOf(one.getStatisticsGroupId())))
-                ));
+                .toList();
-
+
-        List<SupDepart> pcsList = partitionedMap.get(true);      // 派出所
+        // 大队
-        List<SupDepart> dwList = partitionedMap.get(false); // 大队
+        List<SupDepart> dwList = supDepartList.stream()
+                .filter(one -> {
+                    String groupId = one.getStatisticsGroupId();
+                    return !StrUtil.isNotBlank(groupId)
+                            || !DepartGroupEnum.PCS.getId().equals(Integer.valueOf(groupId));
+                })
+                .toList();
 
         for (SupDepart pcs : pcsList) {
             List<Negative> fxsjList = negativeMapper.getVideoSuperviseProblemRank(pcs.getId(), request.getBeginTime(), request.getEndTime());