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

zhaowenyu

2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374

 ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml

@@ -61,7 +61,7 @@
                    AND aft.create_time >= #{params.beginTime}
                </if>
                <if test="params.endTime != null"><!-- 结束时间检索 -->
                    ANDaft.create_time &lt;= #{params.endTime}
                    AND aft.create_time &lt;= #{params.endTime}
                </if>
            </trim>
        </where>
@@ -146,13 +146,13 @@
        WHERE task_id = #{taskId}
    </select>


    <!-- 获取某个时间戳后的任务 -->
    <select id="getTasksAfter" resultType="ArdFlightTask">
        SELECT *
        FROM ard_flight_task
        WHERE end_time > #{lastSyncTime}
    </select>

    <select id="findMaxStartTimeByServerId" resultType="java.util.Date">
        SELECT MAX(start_time)
        FROM ard_flight_task