From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dao/mapping/OrderCharteredCarMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dao/mapping/OrderCharteredCarMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dao/mapping/OrderCharteredCarMapper.xml
index ca3d4e2..2c693f9 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dao/mapping/OrderCharteredCarMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dao/mapping/OrderCharteredCarMapper.xml
@@ -51,7 +51,7 @@
         DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
         DATE_FORMAT(traveltime, '%Y-%m-%d') as time,
         carTime as carTime,
-        (select name from t_server_carmodel where state = 1 and type = 3 and id = a.serverCarModelId) as serverCarModel,
+        (select if(#{language} = 1, chineseName, if(#{language} = 2, englishName, frenchName)) as name from t_server_carmodel where state = 1 and type = 3 and id = a.serverCarModelId) as serverCarModel,
         (6) as orderType,
         state as state
         from t_order_chartered_car as a where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}

--
Gitblit v1.7.1