组织ID取其他表

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml

@@ -58,6 +58,7 @@
     <select id="statAgency" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
         SELECT
             t.*,
+            ag.id AS AGENCY_ID,
             ag.CUSTOMER_ID,
             ag.`LEVEL`,
             ag.PID,
@@ -67,19 +68,19 @@
             LEFT JOIN (
             SELECT
         <if test="level == 'community'">
-            c.id AS AGENCY_ID,
+            c.id AS AGENCY,
         </if>
         <if test="level == 'street'">
-            s.id AS AGENCY_ID,
+            s.id AS AGENCY,
         </if>
         <if test="level == 'district'">
-            di.id AS AGENCY_ID,
+            di.id AS AGENCY,
         </if>
         <if test="level == 'city'">
-            ci.id AS AGENCY_ID,
+            ci.id AS AGENCY,
         </if>
         <if test="level == 'province'">
-            p.id AS AGENCY_ID,
+            p.id AS AGENCY,
         </if>
                 sum( NEIGHBOURHOODS_COUNT ) AS NEIGHBOURHOODS_COUNT,
                 sum( HOUSE_COUNT ) AS HOUSE_COUNT,
@@ -131,7 +132,7 @@
             GROUP BY
             p.id
         </if>
-            ) t ON t.AGENCY_ID = ag.id
+            ) t ON t.AGENCY = ag.id
         WHERE
         ag.CUSTOMER_ID = #{customerId}
         <if test="level == 'community'">