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