|
@@ -27,11 +27,10 @@
|
|
|
and line_dir = #{lineDir}
|
|
|
</if>
|
|
|
<if test="beginAlarmTime != null and beginAlarmTime != ''">
|
|
|
- and TO_CHAR(alarm_time, 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(#{beginAlarmTime}, 'YYYY-MM-DD
|
|
|
- HH24:MI:SS')
|
|
|
+ and DATE_FORMAT(alarm_time, '%Y-%m-%d %H:%i:%s') >= DATE_FORMAT(#{beginAlarmTime}, '%Y-%m-%d %H:%i:%s')
|
|
|
</if>
|
|
|
<if test="endAlarmTime != null and endAlarmTime != ''">
|
|
|
- and TO_CHAR(alarm_time, 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(#{endAlarmTime}, 'YYYY-MM-DD HH24:MI:SS')
|
|
|
+ and DATE_FORMAT(alarm_time, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(#{endAlarmTime}, '%Y-%m-%d %H:%i:%s')
|
|
|
</if>
|
|
|
<if test="source != null and source != ''">
|
|
|
and source = #{source}
|