时间判断修改

business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml

@@ -231,11 +231,11 @@
             <if test="isLock != null and isLock != 0">
                 and a.is_lock=#{isLock}
             </if>
-            <if test="beginAlarmTime != null and beginAlarmTime != 0">
-                <![CDATA[and MONTH(a.alarm_time) >=#{beginAlarmTime}]]>
+            <if test="beginAlarmTime != null and beginAlarmTime != ''">
+                and date_format(a.alarm_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d %H:%i:%S')
             </if>
-            <if test="endAlarmTime != null and endAlarmTime != 0">
-                <![CDATA[and MONTH(a.alarm_time) <=#{endAlarmTime}]]>
+            <if test="endAlarmTime != null and endAlarmTime != ''">
+                AND date_format(a.alarm_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{endAlarmTime},'%Y-%m-%d %H:%i:%S')
             </if>
         </where>
     </select>