From a1aeda6cec2a3c874c2631d91aa30cdc1155ee7b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 13 Oct 2020 17:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=AE=81e=E5=AE=B6-=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml     | 3 ++-
 .../mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml        | 3 ++-
 .../resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml  | 2 +-
 .../mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml    | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml
index 99dae03ca8..f88612d078 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml
@@ -26,6 +26,7 @@
         WHERE DEL_FLAG = 0
           AND ORG_ID = #{agencyId}
           AND YEAR_ID = #{yearId}
+        ORDER BY MONTH_ID
     </select>
     <select id="selectGrassRootsGovernRank" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsGovernRankResultDTO">
         SELECT ORG_NAME,
@@ -38,6 +39,6 @@
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}
           AND MONTH_ID = #{monthId}
-        GROUP BY PARTI_PROJECT_TOTAL
+        ORDER BY PARTI_PROJECT_TOTAL DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml
index db24066bf2..05c17e1378 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml
@@ -22,6 +22,7 @@
         WHERE DEL_FLAG = 0
           AND ORG_ID = #{agencyId}
           AND YEAR_ID = #{yearId}
+        ORDER BY MONTH_ID
     </select>
     <select id="selectGrassRootsOrgRank" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsOrgRankResultDTO">
         SELECT ORG_NAME,
@@ -32,6 +33,6 @@
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}
           AND MONTH_ID = #{monthId}
-        ORDER BY GROUP_TOTAL
+        ORDER BY GROUP_TOTAL DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml
index c91b1c2575..dc13015231 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml
@@ -15,7 +15,7 @@
         FROM screen_an_grass_roots_pm_rank
         WHERE DEL_FLAG = 0
             AND ALL_PARENT_IDS LIKE concat('%', trim(#{agencyId}), '%')
-        ORDER BY GROUP_MEMBER_TOTAL
+        ORDER BY GROUP_MEMBER_TOTAL DESC
         LIMIT #{topNum}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml
index 42231dfce3..82456904ea 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml
@@ -23,5 +23,6 @@
         WHERE DEL_FLAG = '0'
           AND ORG_ID = #{agencyId}
           AND YEAR_ID = #{yearId}
+        ORDER BY MONTH_ID
     </select>
 </mapper>
\ No newline at end of file