Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -82,7 +82,6 @@
         RESOLVED_RATIO DESC,
         GOVERN_RATIO DESC,
         SATISFACTION_RATIO DESC
-        DESC
     </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -300,7 +300,7 @@
                 sca.del_flag = '0'
                 AND sca.PARENT_AREA_CODE=#{areaCode}
                 and sy.CUSTOMER_ID=#{customerId}
-        ORDER BY index_total DESC
+        ORDER BY (sy.govern_ablity+sy.party_dev_ablity+sy.service_ablity) DESC
         LIMIT #{topNum}
     </select>
 
@@ -321,7 +321,7 @@
                 scg.del_flag = '0'
                 AND scg.AREA_CODE like CONCAT(#{areaCode},'%')
                 and sy.CUSTOMER_ID=#{customerId}
-        ORDER BY index_total DESC
+        ORDER BY (sy.govern_ablity+sy.party_dev_ablity+sy.service_ablity) DESC
                 LIMIT #{topNum}
     </select>
 </mapper>