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/TOrderCrossCityMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
index 74d2fe5..8ca56f2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
@@ -73,8 +73,8 @@
<!--根据条件查询跨城出行订单列表-->
<select id="getCrossCityOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (
- SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
- sc.`name` as serverCarModel,ll.`name` as lineName,ot.* FROM t_order_cross_city as ot
+ SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, ' ', di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ sc.chineseName as serverCarModel,ll.`name` as lineName,ot.* FROM t_order_cross_city as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
LEFT JOIN t_car as ci on ci.id= ot.carId
@@ -143,8 +143,8 @@
case when ot.payType = 1 then '微信'
when ot.payType = 2 then '支付宝'
when ot.payType = 3 then '余额' else '' end as payTypeStr,
- sc.`name` as serverCarModel,
- CONCAT(di.`name`,'-',di.phone) as driver,
+ sc.chineseName as serverCarModel,
+ CONCAT(di.firstName, ' ', di.lastName,'-',di.phone) as driver,
CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
ll.`name` as lineName,
cc.`name` as companyName,ot.*
--
Gitblit v1.7.1