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

zhaowenyu

2025-12-24 19763ebd20ad16435f3c1ccfdc8abd1518712cc1

 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>