wujianwei
2025-09-04 80821b70c41a06952fa50207a9a82fa289e0152e
service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -87,11 +87,12 @@
        driver_m.`NAME` as driverName,
        driver_m.MOBILE as driverMobile,
        vhc.LICENSE_PLATE_NUMBER as licensePlateNumber,
        vhc.NAME as boxNum,
        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.REQUIRED_DEPARTURE_TIME as estimatedDepartureTime,
        ord.CONSIGNOR_ADDRESS_ADDR_INFO as consignorAddress,
        ord.CONSIGNEE_ADDRESS_ADDR_INFO as consigneeAddress,
        driver_m.`NAME` as mainDriver,
@@ -103,7 +104,7 @@
        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
        TIMESTAMPDIFF(HOUR, ord.REQUIRED_DEPARTURE_TIME, NOW()) as keyTimeout
        FROM
        tms_shipment ts