From 77e234dca85b32c26388201d54d5d7c01429b9c4 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Tue, 17 Mar 2026 13:10:38 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E8=A7=86=E9=A2=91=E7=9D=A3=E5=AF=9F?= =?UTF-8?q?=E6=8E=92=E5=90=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/enums/DepartGroupEnum.java | 2 +- .../service/datav/DatavServiceImpl.java | 25 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/biutag/supervision/constants/enums/DepartGroupEnum.java b/src/main/java/com/biutag/supervision/constants/enums/DepartGroupEnum.java index b8a72e8..bc72666 100644 --- a/src/main/java/com/biutag/supervision/constants/enums/DepartGroupEnum.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java index 03f5f8f..7304bb1 100644 --- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java @@ -1504,16 +1504,23 @@ public class DatavServiceImpl implements DatavService { List policeVideoSuperviseProblemRankList = new ArrayList<>(); List teamVideoSuperviseProblemRankList = new ArrayList<>(); SupDepartQueryParam supDepartGroupParam = new SupDepartQueryParam(); - supDepartGroupParam.setLevel("2"); + supDepartGroupParam.setLevel("3"); + supDepartGroupParam.setPid(request.getDepartId()); List supDepartList = supDepartResourceService.query(supDepartGroupParam); - Map> partitionedMap = supDepartList.stream() - .collect(Collectors.partitioningBy(one -> - request.getDepartId().equals(one.getPid()) && - DepartGroupEnum.PCS.getId().equals(Integer.valueOf(one.getStatisticsGroupId())) - )); - - List pcsList = partitionedMap.get(true); // 派出所 - List dwList = partitionedMap.get(false); // 大队 + // 派出所 + List pcsList = supDepartList.stream() + .filter(one -> StrUtil.isNotBlank(one.getStatisticsGroupId())) + .filter(one -> DepartGroupEnum.PCS.getId().equals(Integer.valueOf(one.getStatisticsGroupId()))) + .toList(); + + // 大队 + List 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 fxsjList = negativeMapper.getVideoSuperviseProblemRank(pcs.getId(), request.getBeginTime(), request.getEndTime());