榆山项目代码提交 sql代码更新

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -120,22 +120,11 @@
             DEL_FLAG = '0'
           AND STATISTIC_TYPE = #{statisticType}
         ORDER BY
-        <if test="orderType == 0">
             REGISTRATION_RATE DESC,
-        </if>
-        <if test="orderType == 1">
             RESPONSE_RATE DESC,
-        </if>
-        <if test="orderType == 2">
             RESOLUTION_RATE DESC,
-        </if>
-        <if test="orderType == 3">
             SATISFACTION_RATE DESC,
-        </if>
-        <if test="orderType == 4">
-            AUTONOMY_RATE DESC,
-        </if>
-        DEPT_NAME
+            AUTONOMY_RATE DESC
         LIMIT #{pageIndex}, #{pageSize}
     </select>
 
@@ -274,9 +263,9 @@
         sdi.ACREAGE AS acreage,
         edi.IMG_URL AS imgUrl,
         edi.IMG_TYPE AS imgType
-      FROM sys_dept_info sdi
-      LEFT JOIN sys_dept sd ON sd.ID = sdi.DEPT_ID
-      LEFT JOIN epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID
+      FROM yushan_esua_epdc_admin.sys_dept_info sdi
+      LEFT JOIN yushan_esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID
+      LEFT JOIN yushan_esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID
       WHERE sd.del_flag = '0'
       AND sdi.DEL_FLAG = '0'
       AND edi.DEL_FLAG = '0'
@@ -360,7 +349,7 @@
       GROUP BY
       COMPANY
       ORDER BY vaccinationNum DESC
-      </select>
+    </select>
 
     <select id="vaccinationAgeVaccinationStatistics"
             resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO">

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit c660ca360356218f48dbdb987f4fba70f7642435
+Subproject commit 7495db02282ff4f08b1135658c54c20b573ef79f