Merge branch 'dev_screen_data_an_2.0' into dev_temp

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>

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>

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>

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>