From 797ce8fbd25630848681c239717232f75e6289b7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Sep 2021 17:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=9A=82=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/CustomerDataManageResultDTO.java          |  2 +-
 .../service/datastats/impl/DataStatsServiceImpl.java | 12 +++++++++++-
 .../mapper/evaluationindex/EvaluationIndexDao.xml    |  2 --
 3 files changed, 12 insertions(+), 4 deletions(-)

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<CustomerDataManageResultDTO> issueEnd = dataStatsDao.issueList(formDTO);
         List<CustomerDataManageResultDTO> projectEnd = dataStatsDao.projectList(formDTO);
         List<CustomerDataManageResultDTO> patrolEnd = statsStaffPatrolRecordDailyService.patrolList(formDTO);
+
         //4.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
         List<CustomerDataManageResultDTO> userStart = new ArrayList<>();
         List<CustomerDataManageResultDTO> groupStart = new ArrayList<>();
@@ -1981,7 +1982,8 @@ public class DataStatsServiceImpl implements DataStatsService {
             issueStart = dataStatsDao.issueList(formDTO);
             projectStart = dataStatsDao.projectList(formDTO);
         }
-        //5.封装数据并返回
+
+        //5.封装数据
         List<CustomerDataManageResultDTO> finalUserStart = userStart;
         List<CustomerDataManageResultDTO> finalGroupStart = groupStart;
         List<CustomerDataManageResultDTO> finalTopicStart = topicStart;
@@ -2098,6 +2100,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultList.add(dto);
         });
 
+        //6.默认按用户总数降序
+        Collections.sort(resultList, new Comparator<CustomerDataManageResultDTO>() {
+            @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
     </select>
     <select id="getGovernRankList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO">
         SELECT
@@ -174,7 +173,6 @@
                 customer_id = #{customerId}
             </foreach>
         </if>
-        ORDER BY CONVERT(agency_name USING gbk) ASC
     </select>
 
     <!-- 根据组织ID查询组织名 -->