创建时间范围

RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/FireController.java

@@ -56,6 +56,7 @@ public class FireController extends BaseController {
      *
      * @param id 主键
      * @return 单条数据
+     *
      */
     @GetMapping("{id}")
     @ApiOperation(value = "通过主键查询单条119数据", response = Fire.class)

RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java

@@ -22,21 +22,37 @@ public class AlarmFindRequest implements Serializable {
 
     private static final long serialVersionUID = 5773800327954649047L;
     /**
-     * 开始时间
+     * 报警时间开始时间
      */
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("报警时间开始时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /**
-     * 结束时间
+     * 报警时间结束时间
      */
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("报警时间结束时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
+    /**
+     * 创建时间开始时间
+     */
+    @ApiModelProperty("创建时间开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createStartTime;
+
+    /**
+     * 创建时间结束时间
+     */
+    @ApiModelProperty("创建时间结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createEndTime;
+
     /**
      * 报警内容
      */

RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java

@@ -51,10 +51,26 @@ public class EventPageRequest implements Serializable {
     /**
      * 事发结束时间
      */
-    @ApiModelProperty(value = "事发开始时间")
+    @ApiModelProperty(value = "事发结束时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
+
+    /**
+     * 创建时间开始时间
+     */
+    @ApiModelProperty(value = "创建时间开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createStartTime;
+
+    /**
+     * 创建时间结束时间
+     */
+    @ApiModelProperty(value = "创建时间结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createEndTime;
     /**
      * 事发地区(行政区划)
      */

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml

@@ -87,6 +87,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAlarmList" resultType="com.ruoyi.page.domain.Alarm">
         select * from alarm
         <where>
+            <if test="req.createStartTime != null ">
+                create_time &gt;= #{req.createStartTime}
+            </if>
+            <if test="req.createEndTime != null ">
+                and create_time &lt;= #{req.createEndTime}
+            </if>
             <if test="req.startTime != null ">
                 emergency_event_time &gt;= #{req.startTime}
             </if>

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml

@@ -72,6 +72,12 @@
             SELECT *
             FROM event
             <where>
+                <if test="event.createStartTime != null">
+                    AND create_time &gt;= #{event.createStartTime}
+                </if>
+                <if test="event.createEndTime != null">
+                    AND create_time &lt;= #{event.createEndTime}
+                </if>
                 <if test="event.eventType != '转院'">
                     AND event_type != '转院'
                 </if>