diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java index 0b78a43..28992f7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java @@ -108,7 +108,7 @@ public class CockpitStatsHandler { private List convertMapProjectsData(CockpitStats cockpitStats) { List mapProjectsDatas = Lists.newArrayList(); List regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY); - regions = regions.stream().sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); + regions = regions.stream().filter(r -> r.getRegionLevel() != 2).sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); for(RegionDTO region : regions){ CockpitStatsVO.MapProjectsData mapProjectsData = new CockpitStatsVO.MapProjectsData(); mapProjectsData.setRegionCode(region.getRegionCode()); @@ -133,7 +133,7 @@ public class CockpitStatsHandler { private List buidExpertRegionData(CockpitStats cockpitStats) { List regionData = Lists.newArrayList(); List regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY); - regions = regions.stream().sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); + regions = regions.stream().filter(r -> r.getRegionLevel() != 2).sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); List cs = cockpitStatsService.list(); Map csMap = cs.stream().collect(Collectors.toMap(c -> c.getRegionCode() + c.getYear(), CockpitStats::getExpertTotalNum)); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java index 3911c4b..4eb1b7b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java @@ -104,7 +104,7 @@ public class CockpitStatsStatisticsTask { } List regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY); - + regions = regions.stream().filter(r -> r.getRegionLevel() != 2).collect(Collectors.toList()); for(RegionDTO regionDto : regions){ res.add(statisticsData(regionDto.getRegionCode(),regionDto.getRegionName(),0)); for(Integer year : years){