diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index eb49ff744a..8c4309dfd6 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java @@ -113,6 +113,7 @@ public class TopicServiceImpl implements TopicService { } }); }); + //根据 话题的(讨论中 + 已屏蔽 + 已关闭 + 已转议题)的和,倒序 Map> collect = result.stream().collect(Collectors.groupingBy(TopicSubGridResultDTO::getGridId)); Set>> entries = collect.entrySet(); entries.forEach(entry -> { @@ -157,6 +158,7 @@ public class TopicServiceImpl implements TopicService { } }); }); + //根据 话题的(讨论中 + 已屏蔽 + 已关闭 + 已转议题)的和,倒序 Map> collect = result.stream().collect(Collectors.groupingBy(TopicSubAgencyResultDTO::getAgencyId)); Set>> entries = collect.entrySet(); entries.forEach(entry -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java index cd4a68f97a..ace321cba1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java @@ -95,12 +95,13 @@ public class GroupDataServiceImpl implements GroupDataService { Set>> entries = collect.entrySet(); entries.forEach(everyGroup -> { List value = everyGroup.getValue(); + String key = everyGroup.getKey(); List groupPeopleSorted = value.stream().sorted(Comparator.comparing(GridGroupPeopleResultDTO::getGroupCount).reversed()).collect(Collectors.toList()); Integer groupPeopleMedian = groupPeopleSorted.size() % 2 == 0 ? (groupPeopleSorted.get(groupPeopleSorted.size() / 2 - 1).getGroupCount() + groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount()) / 2 : groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount(); result.forEach(grid -> { - if (groupPeopleSorted.get(0).getGridId().equals(grid.getGridId())){ + if (key.equals(grid.getGridId())){ grid.setGroupMedian(groupPeopleMedian);//中位数 //网格下小组成员最大数 grid.setGroupMemberMaxCount(groupPeopleSorted.get(NumConstant.ZERO).getGroupCount()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 5e86bc0bbb..406648d681 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -210,6 +210,7 @@ public class StatsGroupServiceImpl implements StatsGroupService { List sorted = groupPeople.stream().sorted(Comparator.comparing(AgencyGridGroupPeopleResultDTO::getGroupCount).reversed()).collect(Collectors.toList()); Integer groupPeopleMedian; if (sorted.size() == NumConstant.ONE) { + agencyResult.setGroupMedian(sorted.get(NumConstant.ZERO).getGroupCount()); agencyResult.setGroupMemberMaxCount(sorted.get(NumConstant.ZERO).getGroupCount()); agencyResult.setMaxMemberGroupId(sorted.get(NumConstant.ZERO).getGroupId()); agencyResult.setGroupMemberMinCount(sorted.get(NumConstant.ZERO).getGroupCount());