From de17f911865ad0c3a52754140828db92c9e62e46 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 15:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index 6ce8e2d..6ab25c3 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -45,9 +45,10 @@
<if test="driverName != null and driverName != ''"> and thisTab.driver_name like concat('%', #{driverName}, '%')</if>
<if test="driverMobile != null and driverMobile != ''"> and thisTab.driver_mobile = #{driverMobile}</if>
<if test="licensePlateNumber != null and licensePlateNumber != ''"> and thisTab.license_plate_number = #{licensePlateNumber}</if>
- <if test="orderTime != null "> and thisTab.order_time = #{orderTime}</if>
- <if test="orderCreatedTime != null "> and thisTab.order_created_time = #{orderCreatedTime}</if>
- <if test="dispatchCreatedTime != null "> and thisTab.dispatch_created_time = #{dispatchCreatedTime}</if>
+ <if test="orderTimeBegin != null and orderTimeBegin!='' and orderTimeEnd != null and orderTimeEnd!='' "> and thisTab.order_time between #{orderTimeBegin} and #{orderTimeEnd}</if>
+ <if test="orderCreatedTimeBegin != null and orderCreatedTimeBegin!='' and orderCreatedTimeEnd != null and orderCreatedTimeEnd!='' "> and thisTab.order_created_time between #{orderCreatedTimeBegin} and #{orderCreatedTimeEnd}</if>
+ <if test="dispatchCreatedTimeBegin != null and dispatchCreatedTimeBegin!='' and dispatchCreatedTimeEnd != null and dispatchCreatedTimeEnd!='' "> and thisTab.dispatch_created_time between #{dispatchCreatedTimeBegin} and #{dispatchCreatedTimeEnd}</if>
+
<if test="keyCollectionTime != null "> and thisTab.key_collection_time = #{keyCollectionTime}</if>
<if test="estimatedDepartureTime != null "> and thisTab.estimated_departure_time = #{estimatedDepartureTime}</if>
<if test="requiredArrivalTime != null "> and thisTab.required_arrival_time = #{requiredArrivalTime}</if>
@@ -131,6 +132,15 @@
ORDER BY ord.ESTIMATED_DEPARTURE_TIME ASC
LIMIT 1
</select>
+ <select id="selectCwBoxNum" resultType="java.lang.String">
+ SELECT `NAME` from tms_vehicle where LICENSE_PLATE_NUMBER = #{licensePlateNumber} and `NAME` is not null LIMIT 1
+
+ </select>
+ <select id="selectNameByMobile" resultType="java.lang.String">
+ SELECT NAME from tms_driver where MOBILE = #{driverCode}
+ limit 1
+
+ </select>
<!-- 鏂板 -->
<insert id="insertKeyCollectionInfo" parameterType="com.ruoyi.cwgl.domain.KeyCollectionInfo" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0