From b23d80cdbc375643e6a94122c6507fca79e18103 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 18 九月 2025 17:28:58 +0800
Subject: [PATCH] 新增要求出发时间
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 2 +-
service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java | 5 +++++
service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml | 6 +++++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
index d20df72..120ad4c 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
@@ -95,6 +95,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("estimated_departure_time")
private Date estimatedDepartureTime;
+ /** 棰勮鍑哄彂鏃堕棿 */
+ @Excel(name = "瑕佹眰鍑哄彂鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("required_departure_time")
+ private Date requiredDepartureTime;
/** 瑕佹眰鍒拌揪鏃堕棿 */
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 396bc7f..60bcd5a 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
@@ -214,7 +214,7 @@
}
Integer keyTimeout = keyCollectionInfo.getKeyTimeout();
if (keyTimeout!=null && keyTimeout>24){
- Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
+ Date estimatedDepartureTime = keyCollectionInfo.getRequiredDepartureTime();
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
logger.info("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index 782eda6..b4ae8d7 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -28,10 +28,11 @@
<result property="dispatchQuantity" column="dispatch_quantity" />
<result property="remark" column="remark" />
<result property="boxNum" column="box_num" />
+ <result property="requiredDepartureTime" column="required_departure_time" />
</resultMap>
<sql id="selectKeyCollectionInfoVo">
- select thisTab.id, thisTab.customer_name, thisTab.carrier, thisTab.dispatch_no, thisTab.driver_name, thisTab.driver_mobile, thisTab.license_plate_number, thisTab.order_time, thisTab.order_created_time, thisTab.dispatch_created_time, thisTab.key_collection_time, thisTab.estimated_departure_time, thisTab.required_arrival_time, thisTab.consignor_address, thisTab.consignee_address, thisTab.main_driver, thisTab.point_num, thisTab.transport_mode, thisTab.assistant_driver, thisTab.quantity, thisTab.dispatch_quantity, thisTab.remark, thisTab.box_num from key_collection_info AS thisTab
+ select thisTab.id, thisTab.customer_name, thisTab.carrier, thisTab.dispatch_no, thisTab.driver_name, thisTab.driver_mobile, thisTab.license_plate_number, thisTab.order_time, thisTab.order_created_time, thisTab.dispatch_created_time, thisTab.key_collection_time, thisTab.estimated_departure_time, thisTab.required_arrival_time, thisTab.consignor_address, thisTab.consignee_address, thisTab.main_driver, thisTab.point_num, thisTab.transport_mode, thisTab.assistant_driver, thisTab.quantity, thisTab.dispatch_quantity, thisTab.remark, thisTab.box_num , thisTab.required_departure_time from key_collection_info AS thisTab
</sql>
<sql id="selectKeyCollectionInfoVoCount">
select count(0) from key_collection_info as thisTab
@@ -105,6 +106,7 @@
ts.REQUIRED_ARRIVAL_TIME as requiredArrivalTime, -- 娣诲姞鍒悕
ts.DISPATCH_QUANTITY as dispatchQuantity,
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
@@ -156,6 +158,7 @@
<if test="dispatchQuantity != null">dispatch_quantity,</if>
<if test="remark != null">remark,</if>
<if test="boxNum != null">box_num,</if>
+ <if test="requiredDepartureTime != null">required_departure_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="customerName != null">#{customerName},</if>
@@ -180,6 +183,7 @@
<if test="dispatchQuantity != null">#{dispatchQuantity},</if>
<if test="remark != null">#{remark},</if>
<if test="boxNum != null">#{boxNum},</if>
+ <if test="requiredDepartureTime != null">#{requiredDepartureTime},</if>
</trim>
</insert>
--
Gitblit v1.8.0