sql

mallinkService/src/main/resources/mapper/WxActivityMapper.xml

@@ -94,10 +94,10 @@
 <!--		</if>-->
 
 		<if test=" null != startDate and null != endDate ">
-			and not(`activity_end_time` &lt; #{startDate} or `activity_start_time` &gt; #{endDate})
-			/*and ((`activity_start_time` &gt;= #{startDate} and `activity_start_time` &lt;= #{endDate})
+			and not(`activity_end_time` &lt; #{startDate, jdbcType=TIMESTAMP} or `activity_start_time` &gt; #{endDate, jdbcType=TIMESTAMP})
+			<!-- and ((`activity_start_time` &gt;= #{startDate} and `activity_start_time` &lt;= #{endDate})
 			or (`activity_end_time` &gt;= #{startDate} and `activity_end_time` &lt;= #{endDate})
-			or (`activity_start_time` &lt;= #{startDate} and `activity_end_time` &gt;= #{endDate}))*/
+			or (`activity_start_time` &lt;= #{startDate} and `activity_end_time` &gt;= #{endDate}))-->
 		</if>
 		
 		<if test=" null != sendMsg ">