From 39a8afbbe20feadac955247e500caa0433e14674 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 6 Jun 2022 17:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/org/IcHouseDao.xml  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
index 9656f876b6..de4b58c7f7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
@@ -43,7 +43,7 @@
 
     <select id="houseStatNew" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
         SELECT
-        nd.NEIGHBOURHOODS_ID,
+        t.NEIGHBOR_HOOD_ID as NEIGHBOURHOODS_ID,
         g.CUSTOMER_ID,
         g.id AS GRID_ID,
         g.PID,
@@ -54,24 +54,23 @@
         sum( CASE WHEN t.id IS NOT NULL THEN 1 ELSE 0 END ) AS houseCount,
         sum( CASE WHEN (t.id IS NOT NULL and DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS houseIncr,
         sum( CASE WHEN (t.id IS NOT NULL and t.CREATED_TIME != t.UPDATED_TIME and DATE_FORMAT(t.UPDATED_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS houseModify
-        FROM fact_neighborhood_user_house_daily nd
-        left join customer_grid g on g.id = nd.GRID_ID and g.DEL_FLAG = '0'
-        LEFT JOIN (
+        FROM (
                 SELECT
                 h.id,
                 h.RENT_FLAG,
                 n.GRID_ID,
                 h.CREATED_TIME,
-                h.UPDATED_TIME
+                h.UPDATED_TIME,
+                h.NEIGHBOR_HOOD_ID
                 FROM
                 ic_house h
                 LEFT JOIN ic_neighbor_hood n ON h.NEIGHBOR_HOOD_ID = n.id
                 WHERE h.CREATED_TIME &lt; DATE_ADD( DATE_FORMAT(#{dateId},'%Y-%m-%d'), INTERVAL 1 DAY )
                 AND n.DEL_FLAG = '0'
                 AND h.DEL_FLAG = '0'
-        ) t ON t.GRID_ID = g.ID
-        WHERE
-        nd.DEL_FLAG = '0'
+        ) t
+        left join customer_grid g on g.id = t.GRID_ID and g.DEL_FLAG = '0'
+        WHERE 1=1
         <if test='customerId != "" and customerId != null '>
             AND g.CUSTOMER_ID = #{customerId}
         </if>