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/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 2 +-
service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index e95a2d8..f450d72 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -210,7 +210,7 @@
if (keyTimeout!=null && keyTimeout>24){
Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
- return AjaxResult.error("棰勮鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
+ return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
}
return AjaxResult.success("鎴愬姛",2);
}
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