|
@@ -290,10 +290,10 @@
|
|
|
and a.released_type =#{releasedType}
|
|
|
</if>
|
|
|
<if test="beginAlarmTime != null and beginAlarmTime != ''">
|
|
|
- and date_format(a.alarm_time,'%Y-%m-%d %H:%i:%S') >= date_format(#{beginAlarmTime},'%Y-%m-%d %H:%i:%S')
|
|
|
+ and date_format(a.alarm_time,'%Y-%m-%d') >= date_format(#{beginAlarmTime},'%Y-%m-%d')
|
|
|
</if>
|
|
|
<if test="endAlarmTime != null and endAlarmTime != ''">
|
|
|
- AND date_format(a.alarm_time,'%Y-%m-%d %H:%i:%S') <= date_format(#{endAlarmTime},'%Y-%m-%d %H:%i:%S')
|
|
|
+ AND date_format(a.alarm_time,'%Y-%m-%d') <= date_format(#{endAlarmTime},'%Y-%m-%d')
|
|
|
</if>
|
|
|
</where>
|
|
|
order by a.alarm_time desc
|