From e6462541cd39109c4f7ec6e9fa7f8dbd5c4dee5e Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 01 九月 2025 10:03:23 +0800
Subject: [PATCH] 新增前后端

---
 service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index 4215519..f122086 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -91,7 +91,7 @@
         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 +103,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

--
Gitblit v1.8.0