From 521efb9bc33d52ef4772f0b30f8a371ba4b0070c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 二月 2023 19:09:42 +0800
Subject: [PATCH] 更新最新代码
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index 199d0d8..b9cc1fd 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -44,9 +44,6 @@
@Autowired
private ITServerCarmodelService tServerCarmodelService;
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
-
@@ -84,7 +81,8 @@
@RequestMapping("/tSystemPrice_add")
public String tSystemPriceAdd(Model model) {
//查询所有专车车型
- List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", objectId).ne("state", 3));
List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
List<TServerCarmodel> serverCarmodels = new ArrayList<>();
for(TServerCarmodel tsc : modelList){
@@ -117,21 +115,23 @@
//查询所有专车车型
List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+// List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
List<TServerCarmodel> serverCarmodels = new ArrayList<>();
- for(TServerCarmodel tsc : modelList){
- boolean b = true;
- for(TSystemPrice tsp : tSystemPrices){
- if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
- b = false;
- break;
- }
- }
- if(b){
- serverCarmodels.add(tsc);
- }
- }
- model.addAttribute("modelList",serverCarmodels);
+// for(TServerCarmodel tsc : modelList){
+// boolean b = true;
+// for(TSystemPrice tsp : tSystemPrices){
+// if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
+// b = false;
+// break;
+// }
+// }
+// if(b){
+// serverCarmodels.add(tsc);
+// }
+// }
+ TServerCarmodel tSystemPrice1 = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ serverCarmodels.add(tSystemPrice1);
+ model.addAttribute("modelList", serverCarmodels);
return PREFIX + "tSystemPrice_edit.html";
}
--
Gitblit v1.7.1