修复指定天数统计话题时的createdTime校验

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -49,6 +49,17 @@
     <if test='null != customerId and "" != customerId'>
         AND groupp.CUSTOMER_ID = #{customerId}
     </if>
+    <choose>
+        <when test="null != targetDate">
+        AND  topic.CREATED_TIME <![CDATA[<]]>  DATE_SUB( #{targetDate}, INTERVAL - 1 DAY)
+        AND  groupp.CREATED_TIME <![CDATA[<]]>  DATE_SUB( #{targetDate}, INTERVAL - 1 DAY)
+        </when>
+        <otherwise>
+        AND  topic.CREATED_TIME <![CDATA[<]]>  CURDATE( )
+        AND  groupp.CREATED_TIME <![CDATA[<]]>  CURDATE( )
+        </otherwise>
+    </choose>
+
     ORDER BY groupp.GRID_ID
 </select>
 
@@ -98,6 +109,9 @@
         <if test='null != customerId and "" != customerId'>
             AND groupp.CUSTOMER_ID = #{customerId}
         </if>
+        AND  topic.CREATED_TIME <![CDATA[<]]>  DATE_SUB( #{endDate}, INTERVAL - 1 DAY)
+        AND  groupp.CREATED_TIME <![CDATA[<]]>  DATE_SUB( #{endDate}, INTERVAL - 1 DAY)
+
         ORDER BY groupp.GRID_ID
     </select>