事件时间筛选

zc-business/src/main/resources/mapper/business/DcEventMapper.xml

@@ -343,18 +343,18 @@
             </if>
             <if test="direction != null  and direction != ''">and direction = #{direction}</if>
             <if test="userId != null ">and user_id = #{userId}</if>
-            <if test="eventState == 1 ">and start_time BETWEEN #{startTime} and #{endTime}</if>
+            <if test="eventState != null ">and event_state = #{eventState}</if>
+            <if test="eventState == 1 and startTime !=null and  endTime != null ">and start_time BETWEEN #{startTime} and #{endTime}</if>
 
-            <if test="eventState == 0  ">and occurrence_time BETWEEN #{startTime} and #{endTime}</if>
+            <if test="eventState == 0   and startTime !=null and  endTime != null ">and occurrence_time BETWEEN #{startTime} and #{endTime}</if>
 
-            <if test="eventState == 2 ">and end_time BETWEEN #{startTime} and #{endTime}</if>
+            <if test="eventState == 2  and startTime !=null and  endTime != null ">and end_time BETWEEN #{startTime} and #{endTime}</if>
             <if test="estimatedEndTime != null ">and estimated_end_time = #{estimatedEndTime}</if>
             <if test="eventLevel != null ">and event_level = #{eventLevel}</if>
             <if test="eventType != null ">and event_type = #{eventType}</if>
             <if test="eventSubclass != null  and eventSubclass != ''">and event_subclass = #{eventSubclass}</if>
             <if test="eventCause != null  and eventCause != ''">and event_cause = #{eventCause}</if>
             <if test="description != null  and description != ''">and description = #{description}</if>
-            <if test="eventState != null ">and event_state = #{eventState}</if>
             <if test="eventSource != null ">and event_source = #{eventSource}</if>
             <if test="eventNature != null ">and event_nature = #{eventNature}</if>
             <if test="eventSourceTips != null  and eventSourceTips != ''">and event_source_tips = #{eventSourceTips}