From 68635136cb3e0e9e4a166e9d5daedbdc44465e9c Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 14 Jul 2023 09:58:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml    | 1 +
 .../modules/bigdevice/service/impl/UavVideoServiceImpl.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
index beb5cb22a..f38c9bd57 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
@@ -26,6 +26,7 @@
         <if test="endTime != null and endTime != ''">
             AND a.end_time &lt;=CONCAT(DATE_FORMAT(#{endTime},'%Y-%m-%d'),' 23:59:59')
         </if>
+        order by a.add_time desc
     </select>
 
     <select id="queryTodayWorkCycleStatusStatistics"
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/UavVideoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/UavVideoServiceImpl.java
index 2711f1a7f..622526f1c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/UavVideoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/UavVideoServiceImpl.java
@@ -36,9 +36,9 @@ public class UavVideoServiceImpl extends ServiceImpl<UavVideoMapper, UavVideo> i
                 .like(CharSequenceUtil.isNotBlank(uavVideoQo.getVideoUrl()), UavVideo::getVideoUrl, uavVideoQo.getVideoUrl())
                 .eq(CharSequenceUtil.isNotBlank(uavVideoQo.getProjectSn()), UavVideo::getProjectSn, uavVideoQo.getProjectSn())
                 // 拍摄时间 yyyy-MM-dd HH:mm:ss 之后
-                .ge(CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()) ? DateUtil.endOfDay(DateUtil.parse(uavVideoQo.getStartShootingTime())) : null)
+                .ge(CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()) ? DateUtil.beginOfDay(DateUtil.parse(uavVideoQo.getStartShootingTime())) : null)
                 // 拍摄时间 yyyy-MM-dd HH:mm:ss 之前
-                .le(CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()) ? DateUtil.beginOfDay(DateUtil.parse(uavVideoQo.getEndShootingTime())) : null)
+                .le(CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()) ? DateUtil.endOfDay(DateUtil.parse(uavVideoQo.getEndShootingTime())) : null)
                 // 创建时间 yyyy-MM-dd HH:mm:ss 之后
                 .ge(CharSequenceUtil.isNotBlank(uavVideoQo.getStartCreateTime()), UavVideo::getCreateTime, uavVideoQo.getStartCreateTime())
                 // 创建时间 yyyy-MM-dd HH:mm:ss 之前