From 92bfe503dd97027001417018526d28a50bcbc28f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 30 Sep 2020 16:59:57 +0800
Subject: [PATCH] =?UTF-8?q?orgRank=20=E5=8A=A0=E4=B8=8AallParentIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenOrgRankDataDao.xml             | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml
index 95b8e20845..d60557da81 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml
@@ -31,6 +31,7 @@
             'agency' AS ORG_TYPE,
             ID AS ORG_ID,
             PID AS PARENT_ID,
+            PIDS AS allParentIds,
             AGENCY_NAME AS ORG_NAME,
             0 AS PARTY_TOTAL,
             0 AS GROUP_TOTAL,
@@ -48,22 +49,24 @@
     </select>
     <select id="initGridDataList" resultType="com.epmet.entity.evaluationindex.screen.ScreenOrgRankDataEntity">
         SELECT DISTINCT
-            CUSTOMER_ID,
+            gr.CUSTOMER_ID,
             'grid' AS ORG_TYPE,
-            ID AS ORG_ID,
-            AGENCY_ID AS PARENT_ID,
-            GRID_NAME AS ORG_NAME,
+            gr.ID AS ORG_ID,
+            gr.AGENCY_ID AS PARENT_ID,
+            gr.GRID_NAME AS ORG_NAME,
             0 AS PARTY_TOTAL,
             0 AS GROUP_TOTAL,
             0 AS TOPIC_TOTAL,
             0 AS ISSUE_TOTAL,
             0 AS PROJECT_TOTAL,
             0 AS CLOSE_PROJECT_RATIO,
-            0 AS SATISFACTION_RATIO
+            0 AS SATISFACTION_RATIO,
+            CONCAT(IF(ISNULL( ag.PIDS ) || LENGTH( trim( ag.PIDS ) ) <![CDATA[<]]> 1,'',CONCAT(ag.PIDS,':')),ag.ID) AS allParentIds
         FROM
-            dim_grid
+            dim_grid gr
+            LEFT JOIN dim_agency ag ON gr.AGENCY_ID = ag.ID AND ag.CUSTOMER_ID = #{customerId}
         WHERE
-            CUSTOMER_ID = #{customerId}
+            gr.CUSTOMER_ID = #{customerId}
     </select>
 
     <insert id="batchInsertOrgRankData" parameterType="map">