diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java index 5c0827da7b..b5668643a1 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java @@ -41,7 +41,7 @@ public class CustomerDataManageResultDTO { //数据对应dateId @JsonIgnore private String dateId; - + @JsonIgnore private String staffId; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 76c49dbcbd..293ae7fc3d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1968,6 +1968,7 @@ public class DataStatsServiceImpl implements DataStatsService { List issueEnd = dataStatsDao.issueList(formDTO); List projectEnd = dataStatsDao.projectList(formDTO); List patrolEnd = statsStaffPatrolRecordDailyService.patrolList(formDTO); + //4.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据 List userStart = new ArrayList<>(); List groupStart = new ArrayList<>(); @@ -1981,7 +1982,8 @@ public class DataStatsServiceImpl implements DataStatsService { issueStart = dataStatsDao.issueList(formDTO); projectStart = dataStatsDao.projectList(formDTO); } - //5.封装数据并返回 + + //5.封装数据 List finalUserStart = userStart; List finalGroupStart = groupStart; List finalTopicStart = topicStart; @@ -2098,6 +2100,14 @@ public class DataStatsServiceImpl implements DataStatsService { resultList.add(dto); }); + //6.默认按用户总数降序 + Collections.sort(resultList, new Comparator() { + @Override + public int compare(CustomerDataManageResultDTO o1, CustomerDataManageResultDTO o2) { + return o2.getUserCount().compareTo(o1.getUserCount()); + } + }); + return resultList; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml index d140a0dbf3..afa7e56c2d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml @@ -76,7 +76,6 @@ WHERE del_flag = '0' AND parent_agency_id = #{agencyId} - ORDER BY CONVERT(grid_name USING gbk) ASC