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

sen

2025-12-19 6b8f073df16ed45ec9e710abe18d1f4ffde30540

 service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml

@@ -45,9 +45,10 @@
        <if test="driverName != null  and driverName != ''"> and  thisTab.driver_name like concat('%', #{driverName}, '%')</if>
        <if test="driverMobile != null  and driverMobile != ''"> and thisTab.driver_mobile = #{driverMobile}</if>
        <if test="licensePlateNumber != null  and licensePlateNumber != ''"> and thisTab.license_plate_number = #{licensePlateNumber}</if>
        <if test="orderTime != null "> and thisTab.order_time = #{orderTime}</if>
        <if test="orderCreatedTime != null "> and thisTab.order_created_time = #{orderCreatedTime}</if>
        <if test="dispatchCreatedTime != null "> and thisTab.dispatch_created_time = #{dispatchCreatedTime}</if>
        <if test="orderTimeBegin != null and orderTimeBegin!='' and orderTimeEnd != null and orderTimeEnd!='' "> and thisTab.order_time between #{orderTimeBegin} and #{orderTimeEnd}</if>
        <if test="orderCreatedTimeBegin != null and orderCreatedTimeBegin!='' and orderCreatedTimeEnd != null and orderCreatedTimeEnd!='' "> and thisTab.order_created_time between #{orderCreatedTimeBegin} and #{orderCreatedTimeEnd}</if>
        <if test="dispatchCreatedTimeBegin != null and dispatchCreatedTimeBegin!='' and dispatchCreatedTimeEnd != null and dispatchCreatedTimeEnd!='' "> and thisTab.dispatch_created_time between #{dispatchCreatedTimeBegin} and #{dispatchCreatedTimeEnd}</if>

        <if test="keyCollectionTime != null "> and thisTab.key_collection_time = #{keyCollectionTime}</if>
        <if test="estimatedDepartureTime != null "> and thisTab.estimated_departure_time = #{estimatedDepartureTime}</if>
        <if test="requiredArrivalTime != null "> and thisTab.required_arrival_time = #{requiredArrivalTime}</if>
@@ -108,7 +109,7 @@
        ts.REMARK as remark,
        ts.REQUIRED_DEPARTURE_TIME as requiredDepartureTime ,
        TIMESTAMPDIFF(HOUR, ord.ORDER_TIME, ord.CREATED_TIME) as schedulingTimeout,
        TIMESTAMPDIFF(HOUR, ord.REQUIRED_DEPARTURE_TIME, NOW()) as keyTimeout
        TIMESTAMPDIFF(HOUR, ts.REQUIRED_DEPARTURE_TIME, NOW()) as keyTimeout

        FROM
        tms_shipment ts
@@ -131,6 +132,15 @@
        ORDER BY ord.ESTIMATED_DEPARTURE_TIME ASC
        LIMIT 1
    </select>
    <select id="selectCwBoxNum" resultType="java.lang.String">
    SELECT `NAME` from tms_vehicle where LICENSE_PLATE_NUMBER = #{licensePlateNumber} and `NAME` is not null LIMIT 1

    </select>
    <select id="selectNameByMobile" resultType="java.lang.String">
        SELECT NAME from tms_driver where MOBILE =  #{driverCode}
        limit 1

    </select>

    <!-- 新增 -->
    <insert id="insertKeyCollectionInfo" parameterType="com.ruoyi.cwgl.domain.KeyCollectionInfo"  useGeneratedKeys="true" keyProperty="id">