orgRank 加上allParentIds

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,
+            gr.ID AS ORG_ID,
-            AGENCY_ID AS PARENT_ID,
+            gr.AGENCY_ID AS PARENT_ID,
-            GRID_NAME AS ORG_NAME,
+            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">