2022年8月29日18时30分

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/warehouse/domain/TMonitoringAlarms.java

@@ -23,25 +23,25 @@ public class TMonitoringAlarms extends BaseEntity
     private Long id;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateDate;
 
     /** 告警时间  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "告警时间 ", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "告警时间 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date alarmDate;
 
     private List<String> alarmDateStart;
 
     /** 告警处理时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "告警处理时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "告警处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date alarmDealDate;
 
     private List<String> alarmDealDateStart;

ruoyi-warehouse/src/main/resources/mapper/warehouse/TMonitoringAlarmsMapper.xml

@@ -42,10 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createDate != null "> and create_date = #{createDate}</if>
             <if test="updateDate != null "> and update_date = #{updateDate}</if>
             <if test='alarmDateStart != null and alarmDateStart[0] != null and alarmDateStart[1]!= ""'>
-                and alarm_date BETWEEN #{alarmDateStart[0]} AND #{alarmDateStart[1]}
+                and DATE_FORMAT(alarm_date,'%Y-%m-%d') BETWEEN #{alarmDateStart[0]} AND #{alarmDateStart[1]}
             </if>
             <if test='alarmDealDateStart != null and alarmDealDateStart[0] != null and alarmDealDateStart[1]!= ""'>
-                and alarm_deal_date BETWEEN #{alarmDealDateStart[0]} AND #{alarmDealDateStart[1]}
+                and DATE_FORMAT(alarm_deal_date,'%Y-%m-%d') BETWEEN #{alarmDealDateStart[0]} AND #{alarmDealDateStart[1]}
             </if>
             <if test="alarmDealPeople != null  and alarmDealPeople != ''"> and alarm_deal_people = #{alarmDealPeople}</if>
             <if test="alarmDealResult != null  and alarmDealResult != ''"> and alarm_deal_result = #{alarmDealResult}</if>