Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp

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

@@ -4,6 +4,7 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectGridDailyDao">
 
     <!--    下级网格的效率（解决率）列表 -->
+    <!-- 排序 +0 是把100排在99上边，不写 '+0'会出现 29 ，28 ，100 -->
     <select id="queryGridEfficiencyAnalysis" parameterType="map" resultType="com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO">
         SELECT
             m.CUSTOMER_ID AS customerId,
@@ -20,7 +21,7 @@
             m.DEL_FLAG = '0'
             AND a.AREA_CODE LIKE concat( #{areaCode}, '%')
             AND M.DATE_ID=#{dateId}
-            order by resolvedRatio desc
+            order by resolvedRatio+0 desc
     </select>
 
     <select id="selectLastDateId" resultType="java.lang.String">

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

@@ -29,6 +29,7 @@
     </select>
 
     <!--    下级组织的效率（解决率）列表 -->
+    <!-- 排序 +0 是把100排在99上边，不写 '+0'会出现 29 ，28 ，100 -->
     <select id="queryEfficiencyAnalysis" parameterType="map" resultType="com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO">
         SELECT
             m.CUSTOMER_ID AS customerId,
@@ -51,6 +52,6 @@
                 order by t1.DATE_ID desc
                 limit 1
             )and m.CUSTOMER_ID=#{customerId}
-            order by resolvedRatio desc
+            order by resolvedRatio+0 desc
     </select>
 </mapper>

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

@@ -35,6 +35,7 @@
 
 
     <!-- 查询公众参与各类总数 -->
+    <!-- 2021-05-26,按照要求，根据注册人数排序 -->
     <select id="selectPublicPartiTotalByAreaCode" resultType="com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO">
        SELECT
             totalData.ORG_NAME AS NAME,
@@ -54,13 +55,7 @@
         WHERE
             totalData.DEL_FLAG = '0'
             AND agency.PARENT_AREA_CODE=#{areaCode}
-            ORDER BY
-            (totalData.REG_USER_TOTAL + totalData.JOIN_USER_TOTAL + totalData.TOPIC_TOTAL + totalData.ISSUE_TOTAL + totalData.PROJECT_TOTAL) DESC,
-                                totalData.REG_USER_TOTAL desc,
-                                totalData.JOIN_USER_TOTAL desc,
-                                totalData.TOPIC_TOTAL desc,
-                                totalData.ISSUE_TOTAL desc,
-                                totalData.PROJECT_TOTAL desc
+            ORDER BY totalData.REG_USER_TOTAL desc
     </select>