解决系统告警导出和时间查询问题

doc-system/src/main/java/com/doc/system/domain/SysAlarm.java

@@ -39,14 +39,14 @@ public class SysAlarm extends BaseEntity {
      * 告警级别
      */
     @ApiModelProperty("告警级别")
-    @Excel(name = "告警级别")
+    @Excel(name = "告警级别",dictType="event_level")
     private Integer alarmLevel;
 
     /**
      * 告警类型
      */
     @ApiModelProperty("告警类型")
-    @Excel(name = "告警类型")
+    @Excel(name = "告警类型",dictType="alarm_type")
     private Integer alarmType;
 
     /**
@@ -54,6 +54,6 @@ public class SysAlarm extends BaseEntity {
      */
     @ApiModelProperty("告警时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "告警时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "告警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date alarmTime;
 }

doc-system/src/main/resources/mapper/system/SysAlarmMapper.xml

@@ -27,6 +27,12 @@
             <if test="alarmLevel != null ">and ALARM_LEVEL = #{alarmLevel}</if>
             <if test="alarmType != null ">and ALARM_TYPE = #{alarmType}</if>
             <if test="alarmTime != null ">and DATE(ALARM_TIME) = #{alarmTime,jdbcType=DATE}</if>
+            <if test="params.beginAlarmTime != null and params.beginAlarmTime != ''"><!-- 开始时间检索 -->
+                AND DATE(ALARM_TIME) &gt;= #{params.beginAlarmTime}
+            </if>
+            <if test="params.endAlarmTime != null and params.endAlarmTime != ''"><!-- 结束时间检索 -->
+                AND DATE(ALARM_TIME) &lt;= #{params.endAlarmTime}
+            </if>
         </where>
         order by alarm_time desc
     </select>
@@ -78,4 +84,4 @@
             #{alarmId}
         </foreach>
     </delete>
-</mapper>
+</mapper>