From c0f6fb84a98db212b0780f44430d4e0cdf1b0302 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 10 九月 2025 15:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index 4215519..782eda6 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -27,10 +27,11 @@
<result property="quantity" column="quantity" />
<result property="dispatchQuantity" column="dispatch_quantity" />
<result property="remark" column="remark" />
+ <result property="boxNum" column="box_num" />
</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 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 from key_collection_info AS thisTab
</sql>
<sql id="selectKeyCollectionInfoVoCount">
select count(0) from key_collection_info as thisTab
@@ -56,6 +57,7 @@
<if test="transportMode != null and transportMode != ''"> and thisTab.transport_mode = #{transportMode}</if>
<if test="assistantDriver != null and assistantDriver != ''"> and thisTab.assistant_driver = #{assistantDriver}</if>
<if test="quantity != null "> and thisTab.quantity = #{quantity}</if>
+ <if test="boxNum != null "> and thisTab.box_num = #{boxNum}</if>
<if test="dispatchQuantity != null "> and thisTab.dispatch_quantity = #{dispatchQuantity}</if>
</sql>
@@ -87,11 +89,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 +106,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
@@ -152,6 +155,7 @@
<if test="quantity != null">quantity,</if>
<if test="dispatchQuantity != null">dispatch_quantity,</if>
<if test="remark != null">remark,</if>
+ <if test="boxNum != null">box_num,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="customerName != null">#{customerName},</if>
@@ -175,6 +179,7 @@
<if test="quantity != null">#{quantity},</if>
<if test="dispatchQuantity != null">#{dispatchQuantity},</if>
<if test="remark != null">#{remark},</if>
+ <if test="boxNum != null">#{boxNum},</if>
</trim>
</insert>
--
Gitblit v1.8.0