From 81b678fa03acaaf22b7f668888e7883e2c443b3a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 30 May 2022 14:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87ID=E5=8F=96=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/stats/FactGridUserHouseDailyDao.xml      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
index 8dabf42170..ca3a8ebb99 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
+++ b/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'">