网格判断del=0

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
-        <where>
+        WHERE
-            <if test='customerId != "" and customerId != null '>
+        g.DEL_FLAG = '0'
-                AND g.CUSTOMER_ID = #{customerId}
+        <if test='customerId != "" and customerId != null '>
-            </if>
+            AND g.CUSTOMER_ID = #{customerId}
-        </where>
+        </if>
         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 &lt; DATE_ADD( DATE_FORMAT(#{dateId},'%Y-%m-%d'), INTERVAL 1 DAY )
-        <where>
+        AND n.DEL_FLAG = '0'
-            <if test='customerId != "" and customerId != null '>
+        WHERE
-                AND g.CUSTOMER_ID = #{customerId}
+        g.DEL_FLAG = '0'
-            </if>
+        <if test='customerId != "" and customerId != null '>
-        </where>
+            AND g.CUSTOMER_ID = #{customerId}
+        </if>
         GROUP BY
         g.CUSTOMER_ID,
         g.id;