From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
index 42e6e9c..a86aa8e 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
@@ -63,10 +63,11 @@
SELECT
GROUP_CONCAT(case when type = 1 then '专车'
when type = 2 then '出租车'
- when type = 3 then '直通车'
+ when type = 3 then '跨城'
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
<where>
@@ -123,10 +124,11 @@
SELECT
GROUP_CONCAT(case when type = 1 then '专车'
when type = 2 then '出租车'
- when type = 3 then '直通车'
+ when type = 3 then '跨城'
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
<where>
--
Gitblit v1.7.1