From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
index 3d5137c..c4589cc 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
@@ -32,12 +32,12 @@
<!--根据条件查询专车改派订单列表-->
<select id="getPrivateCarReassignOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT rr.id,rr.insertTime,
- dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
- CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(dd1.firstName, " ", dd1.lastName) as originalDriverName,dd1.phone as originalDriverPhone,
+ CONCAT(dd1.firstName, " ", dd1.lastName,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
- dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
- CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ CONCAT(dd2.firstName, " ", dd2.lastName) as nowDriverName,dd2.phone as nowDriverPhone,
+ CONCAT(dd2.firstName, " ", dd2.lastName,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
LEFT JOIN t_order_private_car as opc on opc.id = rr.orderId
@@ -92,7 +92,7 @@
<where>
(dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
<if test="name != null and name != ''">
- and dd.name LIKE CONCAT('%',#{name},'%')
+ and CONCAT(dd.firstName, ' ', dd.lastName) LIKE CONCAT('%',#{name},'%')
</if>
<if test="phone != null and phone != ''">
and dd.phone LIKE CONCAT('%',#{phone},'%')
@@ -111,7 +111,7 @@
<where>
(dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
<if test="name != null and name != ''">
- and dd.name LIKE CONCAT('%',#{name},'%')
+ and CONCAT(dd.firstName, ' ', dd.lastName) LIKE CONCAT('%',#{name},'%')
</if>
<if test="phone != null and phone != ''">
and dd.phone LIKE CONCAT('%',#{phone},'%')
@@ -125,11 +125,11 @@
<select id="getCrossReassignOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT rr.id,rr.insertTime,
dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
- CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(dd1.firstName, ' ', dd1.lastName,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
- CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ CONCAT(dd2.firstName, ' ', dd2.lastName,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
LEFT JOIN t_order_cross_city as opc on opc.id = rr.orderId
@@ -180,12 +180,12 @@
<!--根据条件查询跨城改派订单列表-->
<select id="getSmallPieceLogisticsList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT rr.id,rr.insertTime,
- dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
- CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(dd1.firstName, " ", dd1.lastName) as originalDriverName,dd1.phone as originalDriverPhone,
+ CONCAT(dd1.firstName, " ", dd1.lastName,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
- dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
- CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ CONCAT(dd2.firstName, " ", dd2.lastName) as nowDriverName,dd2.phone as nowDriverPhone,
+ CONCAT(dd2.firstName, " ", dd2.lastName,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
LEFT JOIN t_order_logistics as opc on opc.id = rr.orderId
@@ -253,7 +253,7 @@
and a.id in (select driverId from t_line_shift_driver where lineShiftId = #{lineShiftId} and DATE_FORMAT(`day`, '%Y-%m-%d') = DATE_FORMAT(#{time}, '%Y-%m-%d') and laveSeat >= #{num})
and a.id != #{driverId}
<if test="name != null and name != ''">
- and a.name LIKE CONCAT('%',#{name},'%')
+ and CONCAT(a.firstName, ' ', a.lastName) LIKE CONCAT('%',#{name},'%')
</if>
<if test="phone != null and phone != ''">
and a.phone LIKE CONCAT('%',#{phone},'%')
--
Gitblit v1.7.1