Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java

@@ -119,6 +119,10 @@ public class DcDeviceOfflineRecord extends BaseEntity
     @Excel(name = "状态(0未处理 1已处理 2自动处理)")
     private String status;
 
+    private String startTime;
+
+    private String endTime;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -246,6 +250,22 @@ public class DcDeviceOfflineRecord extends BaseEntity
         return status;
     }
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -44,6 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="startTime != null  and startTime != '' and endTime != null and endTime != ''">
+                and date_format(create_time,'%Y-%m-%d %H:%i:%s') >= date_format(#{startTime},'%Y-%m-%d %H:%i:%s')
+                and date_format(create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
         </where>
     </select>