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

wujianwei

2025-09-02 dda4c08d41693d2495a13e7db230c3e9747540de

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

@@ -80,52 +80,51 @@
        order by thisTab.id desc
    </select>
    <select id="selectCwData" resultType="com.ruoyi.cwgl.domain.KeyCollectionInfo">
SELECT
   customer.`NAME` as customerName,
   bp.`NAME` as carrier,
   ts.DISPATCH_NO as dispatchNo,
   driver_m.`NAME` as driverName,
   driver_m.MOBILE as driverMobile,
   vhc.LICENSE_PLATE_NUMBER as licensePlateNumber,
   ord.ORDER_TIME as orderTime,
   ord.CREATED_TIME as orderCreatedTime,
   ts.CREATED_TIME as dispatchCreatedTime,
   now() as keyCollectionTime, -- 放请求查询到的时间
   ord.ESTIMATED_DEPARTURE_TIME as estimatedDepartureTime,
   ord.CONSIGNOR_ADDRESS_ADDR_INFO as consignorAddress,
   ord.CONSIGNEE_ADDRESS_ADDR_INFO as consigneeAddress,
   driver_m.`NAME` as mainDriver,
   ts.POINT_NUM as pointNum,
   ts.TRANSPORT_MODE as transportMode,
   driver_a.`NAME` as assistantDriver,
   ts.QUANTITY as quantity,
   ts.REQUIRED_ARRIVAL_TIME as ,
   ts.DISPATCH_QUANTITY as dispatchQuantity,
   ts.REMARK as remark,
   TIMESTAMPDIFF(HOUR, ord.ORDER_TIME, ord.CREATED_TIME) as schedulingTimeout,
   TIMESTAMPDIFF(HOUR, ord.ESTIMATED_DEPARTURE_TIME, NOW()) as keyTimeout
        SELECT
        customer.`NAME` as customerName,
        bp.`NAME` as carrier,
        ts.DISPATCH_NO as dispatchNo,
        driver_m.`NAME` as driverName,
        driver_m.MOBILE as driverMobile,
        vhc.LICENSE_PLATE_NUMBER as licensePlateNumber,
        ord.ORDER_TIME as orderTime,
        ord.CREATED_TIME as orderCreatedTime,
        ts.CREATED_TIME as dispatchCreatedTime,
        now() as keyCollectionTime, -- 放请求查询到的时间
        ord.REQUIRED_DEPARTURE_TIME as estimatedDepartureTime,
        ord.CONSIGNOR_ADDRESS_ADDR_INFO as consignorAddress,
        ord.CONSIGNEE_ADDRESS_ADDR_INFO as consigneeAddress,
        driver_m.`NAME` as mainDriver,
        ts.POINT_NUM as pointNum,
        ts.TRANSPORT_MODE as transportMode,
        driver_a.`NAME` as assistantDriver,
        ts.QUANTITY as quantity,
        ts.REQUIRED_ARRIVAL_TIME as requiredArrivalTime,  -- 添加别名
        ts.DISPATCH_QUANTITY as dispatchQuantity,
        ts.REMARK as remark,
        TIMESTAMPDIFF(HOUR, ord.ORDER_TIME, ord.CREATED_TIME) as schedulingTimeout,
        TIMESTAMPDIFF(HOUR, ord.REQUIRED_DEPARTURE_TIME, NOW()) as keyTimeout

FROM
  tms_shipment ts
  left JOIN oms_order ord ON ts.DISPATCH_NO = ord.DISPATCH_CODE
  LEFT JOIN base_customer customer ON customer.ID = ord.CUSTOMER_ID
  LEFT JOIN tms_vehicle vhc ON ts.VEHICLE_ID = vhc.id
  LEFT JOIN base_provider bp ON bp.ID = ts.CARRIER_ID
  LEFT JOIN tms_driver driver_m ON driver_m.ID = ts.MAIN_DRIVER_ID
  LEFT JOIN tms_driver driver_a ON driver_a.ID = ts.ASSISTANT_DRIVER_ID
WHERE
  ts.`STATUS` = 'A'
  <if test="driverCode != null and driverCode != '' ">
      and driver_m.MOBILE = #{driverCode}
  </if>
  <if test="driverName != null and driverName != ''">
      and driver_m.NAME = #{driverName}
  </if>
ORDER BY ord.ESTIMATED_DEPARTURE_TIME asc
LIMIT 1
        FROM
        tms_shipment ts
        LEFT JOIN oms_order ord ON ts.DISPATCH_NO = ord.DISPATCH_CODE
        LEFT JOIN base_customer customer ON customer.ID = ord.CUSTOMER_ID
        LEFT JOIN tms_vehicle vhc ON ts.VEHICLE_ID = vhc.id
        LEFT JOIN base_provider bp ON bp.ID = ts.CARRIER_ID
        LEFT JOIN tms_driver driver_m ON driver_m.ID = ts.MAIN_DRIVER_ID
        LEFT JOIN tms_driver driver_a ON driver_a.ID = ts.ASSISTANT_DRIVER_ID

        WHERE
        ts.`STATUS` = 'A'
        <if test="driverCode != null and driverCode != ''">
            AND driver_m.MOBILE = #{driverCode}
        </if>
        <if test="driverName != null and driverName != ''">
            AND driver_m.NAME = #{driverName}
        </if>


        ORDER BY ord.ESTIMATED_DEPARTURE_TIME ASC
        LIMIT 1
    </select>

    <!-- 新增 -->