From 5eb34e55c787262e19ad7f8d2ea46ac9b38900c4 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 25 Aug 2021 22:33:34 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF-=E5=B7=A5=E4=BD=9C=E5=8F=B0-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=20init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/EpdcScreenDao.xml | 25 ++++++-------------
 epdc-cloud-client-yushan                      |  2 +-
 2 files changed, 8 insertions(+), 19 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 72df194..4e5dbbe 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
@@ -42,26 +42,15 @@
 
     <select id="itemCategoryStatistics" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemCategoryResultDTO">
         SELECT
-            ec.CATEGORY_NAME,
-            t.itemNum
+            c.CATEGORY_NAME,
+            COUNT(i.ID) AS itemNum
         FROM
-            esua_epdc_analysis.meta_epdc_category ec
-                LEFT JOIN (
-                SELECT
-                    c.CATEGORY_NAME,
-                    IFNULL( SUM( c.ITEM_TOTLE ), 0 ) itemNum
-                FROM
-                    esua_epdc_analysis.epdc_issue_item_category c
-                WHERE
-                    c.CATEGORY_TYPE = '1'
-                GROUP BY
-                    c.CATEGORY_NAME
-                ORDER BY
-                    itemNum DESC
-            ) t ON t.CATEGORY_NAME = ec.CATEGORY_NAME
+            esua_epdc_events.epdc_item i
+                LEFT JOIN esua_epdc_events.epdc_category c ON c.category_code = i.FIRST_CATEGORY_CODE AND c.del_flag = '0'
         WHERE
-            ec.DEL_FLAG = 0
-          AND ec.CATEGORY_TYPE = '0'
+            i.DEL_FLAG = '0'
+        GROUP BY
+            i.FIRST_CATEGORY_CODE
     </select>
 
     <select id="itemStatusStatistics" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemStatusResultDTO">
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 8b23ab3..3c19e89 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 8b23ab3ee8861db7b498c9ac07b44b19d9f78d16
+Subproject commit 3c19e894f4347b968110dc6f781a29a477d7d77f