Merge branch 'dev_export_excel' into develop

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;
 
 }

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;
     }
 

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查询组织名 -->