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
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java
index 0cd7de5..e35ba25 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java
@@ -47,13 +47,18 @@
})
public ResultUtil<List<TCharteredService>> list(Integer serverCarModelId){
EntityWrapper<TCharteredService> tCharteredServiceEntityWrapper = new EntityWrapper<>();
- tCharteredServiceEntityWrapper.eq("state",1);
+ tCharteredServiceEntityWrapper.eq("status",1);
if (serverCarModelId!=-1){
tCharteredServiceEntityWrapper.eq("serverCarModelId",serverCarModelId);
}
List<TCharteredService> tCharteredServices = charteredService.selectList(tCharteredServiceEntityWrapper);
+ for (TCharteredService tCharteredService : tCharteredServices) {
+ ServerCarModel serverCarModel = serverCarModelService.selectById(tCharteredService.getServerCarModelId());
+ if (serverCarModel!=null) {
+ tCharteredService.setServerCarModelName(serverCarModel.getName());
+ }
+ }
return ResultUtil.success(tCharteredServices);
-
}
@ResponseBody
@@ -65,7 +70,6 @@
public ResultUtil<List<ServerCarModel>> orderCharteredCar(){
List<ServerCarModel> serverCarModels = serverCarModelService.selectList(new EntityWrapper<ServerCarModel>().eq("type", 3).eq("state", 1));
return ResultUtil.success(serverCarModels);
-
}
--
Gitblit v1.7.1