From 53426d6be226d5fb0ffd3959d4b63b71e919423f Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 19 Nov 2021 13:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B9=E7=9B=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=94=B9=E4=B8=BA=E7=A4=BE=E5=8C=BA=E7=BA=A7=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/service/impl/ScreenGovernanceServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/screen/ScreenGovernanceDao.xml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
index 6c57c406..7209bac5 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
@@ -54,7 +54,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
         int itemTotal = agencyItemInfoList.stream().mapToInt(ScreenGovernItemInfoResultDTO::getItemTotal).sum();
         int itemSettleTotal = agencyItemInfoList.stream().mapToInt(ScreenGovernItemInfoResultDTO::getItemSettleTotal).sum();
         agencyItemInfoList.forEach(item -> {
-            if (!"grid_party".equals(item.getTypeKey())) {
+            if (!"community_party".equals(item.getTypeKey())) {
                 item.setItemTotal(itemTotal);
                 item.setItemSettleTotal(itemSettleTotal);
             }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
index 7a938b96..3754dc79 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
@@ -26,8 +26,8 @@
 
     <select id="getAgencyItemInfoList" resultType="com.elink.esua.epdc.dto.screen.result.ScreenGovernItemInfoResultDTO">
         SELECT
-            sd.pid AS orgId,
-            sd.type_key,
+            psd.id AS orgId,
+            psd.type_key,
             IFNULL(sum(iis.ITEM_TOTAL), 0) AS ITEM_TOTAL,
             IFNULL(
                 sum(iis.ITEM_SETTLE_TOTAL),
@@ -35,6 +35,7 @@
             ) AS ITEM_SETTLE_TOTAL
         FROM
             esua_epdc_admin.sys_dept sd
+        LEFT JOIN esua_epdc_admin.sys_dept psd ON psd.id = sd.pid
         LEFT JOIN esua_epdc_analysis.epdc_issue_item_statistics iis ON iis.GRID_ID = sd.id
         WHERE
             sd.pid != 0