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 e2dacf96e8..e6f28fc433 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 @@ -25,12 +25,14 @@ LEFT JOIN ic_neighbor_hood n ON h.NEIGHBOR_HOOD_ID = n.id WHERE h.CREATED_TIME < 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 - - - AND g.CUSTOMER_ID = #{customerId} - - + WHERE + g.DEL_FLAG = '0' + + AND g.CUSTOMER_ID = #{customerId} + GROUP BY g.CUSTOMER_ID, g.id @@ -47,11 +49,12 @@ customer_grid g LEFT JOIN ic_neighbor_hood n ON n.GRID_ID = g.id AND n.CREATED_TIME < DATE_ADD( DATE_FORMAT(#{dateId},'%Y-%m-%d'), INTERVAL 1 DAY ) - - - AND g.CUSTOMER_ID = #{customerId} - - + AND n.DEL_FLAG = '0' + WHERE + g.DEL_FLAG = '0' + + AND g.CUSTOMER_ID = #{customerId} + GROUP BY g.CUSTOMER_ID, g.id;