From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/resources/mapper/ArdFlightTaskPartMapper.xml |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/ArdFlightTaskPartMapper.xml b/ard-work/src/main/resources/mapper/ArdFlightTaskPartMapper.xml
index c11cad7..1416f31 100644
--- a/ard-work/src/main/resources/mapper/ArdFlightTaskPartMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdFlightTaskPartMapper.xml
@@ -8,21 +8,27 @@
     <!-- 插入一条分片数据 -->
     <insert id="insert" parameterType="ArdFlightTaskPart" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO ard_flight_task_part
-            (box_sn, count, data_part, create_time)
-        VALUES
-            (#{boxSn}, #{count}, #{dataPart}, #{createTime})
+            (box_sn, count, data_part, start_time, end_time, create_time)
+        VALUES (#{boxSn}, #{count}, #{dataPart}, #{startTime}, #{endTime}, #{createTime})
     </insert>
-    <select id="selectByTaskStartTime" resultType="ArdFlightTaskPart">
+    <select id="selectByTimeRange" resultType="ArdFlightTaskPart">
         SELECT *
         FROM ard_flight_task_part u
-        WHERE u.box_sn = #{boxSn}
-        <if test="params.beginTime != null"><!-- 开始时间检索 -->
-            AND u.create_time &gt;= #{params.beginTime}
-        </if>
-        <if test="params.endTime != null"><!-- 结束时间检索 -->
-            AND u.create_time &lt;= #{params.endTime}
-        </if>
-        ORDER BY u.create_time asc
+        <where>
+            u.box_sn = #{boxSn}
+            <!-- 动态参数中的开始时间 -->
+            <if test="params.beginTime != null">
+                AND u.end_time &gt;= #{params.beginTime}  <!-- blob 内最后状态 >= 架次起飞 -->
+            </if>
+            <!-- 动态参数中的结束时间 -->
+            <if test="params.endTime != null">
+                AND u.start_time &lt;= #{params.endTime}  <!-- blob 内第一状态 <= 架次降落 -->
+            </if>
+        </where>
+        ORDER BY u.start_time ASC
     </select>
 
+
+
+
 </mapper>

--
Gitblit v1.9.3