Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -264,6 +264,7 @@ public class IndexServiceImpl implements IndexService {
             indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
             indexRank.setTotalIndex(getRound(indexRank.getPartyDevAbility() + indexRank.getGovernAbility() + indexRank.getServiceAbility()));
         });
+        subAgencyIndexRankResultDTOS.sort(Comparator.comparing(SubAgencyIndexRankResultDTO::getTotalIndex).reversed());
         return subAgencyIndexRankResultDTOS;
     }
 
@@ -297,6 +298,7 @@ public class IndexServiceImpl implements IndexService {
                 rank.setTotalIndex(getRound(rank.getPartyDevAbility() + rank.getGovernAbility() + rank.getServiceAbility()));
             });
         }
+        subAgencyIndexRankResultDTOS.sort(Comparator.comparing(AnNingSubAgencyIndexRankResultDTO::getTotalIndex).reversed());
         return subAgencyIndexRankResultDTOS;
     }
 
@@ -316,6 +318,7 @@ public class IndexServiceImpl implements IndexService {
             indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
             indexRank.setTotalIndex(getRound(indexRank.getPartyDevAbility() + indexRank.getGovernAbility() + indexRank.getServiceAbility()));
         });
+        subAgencyIndexRankResultDTOS.sort(Comparator.comparing(SubAgencyIndexRankResultDTO::getTotalIndex).reversed());
         return subAgencyIndexRankResultDTOS;
     }
 
@@ -446,6 +449,7 @@ public class IndexServiceImpl implements IndexService {
             indexRank.setOrgType("grid");
             indexRank.setTotalIndex(getRound(indexRank.getPartyDevAbility() + indexRank.getGovernAbility() + indexRank.getServiceAbility()));
         });
+        gridList.sort(Comparator.comparing(SubAgencyIndexRankResultDTO::getTotalIndex).reversed());
         return gridList;
     }