From 026bbd96f7a568e4bfb0b7bc36b76b823a8a8fea Mon Sep 17 00:00:00 2001
From: zhangfh <jyyzzfh@126.com>
Date: Fri, 20 Aug 2021 18:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=20sql=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/EpdcScreenDao.xml | 21 +++++--------------
 epdc-cloud-client-yushan                      |  2 +-
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
index 32e8f55..46ac91c 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
+++ b/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">
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index c660ca3..7495db0 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit c660ca360356218f48dbdb987f4fba70f7642435
+Subproject commit 7495db02282ff4f08b1135658c54c20b573ef79f