From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:23:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 43981ca..ec969f8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -136,6 +136,8 @@
model.addAttribute("zcModelList",zcModelList);
List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
model.addAttribute("kcModelList",kcModelList);
+ List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ model.addAttribute("xjModelList",xjModelList);
List<TCarColor> state = carColorService.selectList(new EntityWrapper<TCarColor>().eq("state", 1));
model.addAttribute("color", state);
return PREFIX + "tCar_add.html";
@@ -198,6 +200,7 @@
Integer six = 1;
Integer zcModel = 0;
Integer kcModel = 0;
+ Integer xjModel = 0;
for (TCarService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -211,7 +214,8 @@
kcModel = obj.getServerCarModelId();
}
if (obj.getType() == 4){
- four = 2;
+ four = 4;
+ xjModel = obj.getServerCarModelId();
}
if (obj.getType() == 5){
five = 2;
@@ -228,11 +232,14 @@
model.addAttribute("six",six);
model.addAttribute("zcModel",zcModel);
model.addAttribute("kcModel",kcModel);
+ model.addAttribute("xjModel",xjModel);
List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
model.addAttribute("zcModelList",zcModelList);
List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
model.addAttribute("kcModelList",kcModelList);
+ List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ model.addAttribute("xjModelList",xjModelList);
//车辆品牌
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
@@ -258,6 +265,7 @@
Integer six = 1;
Integer zcModel = 0;
Integer kcModel = 0;
+ Integer xjModel = 0;
for (TCarService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -267,12 +275,19 @@
four = 2;
zcModel = obj.getServerCarModelId();
}
+ if (obj.getType() == 4){
+ four = 4;
+ xjModel = obj.getServerCarModelId();
+ }
}
model.addAttribute("one",one);
model.addAttribute("four",four);
model.addAttribute("zcModel",zcModel);
+ model.addAttribute("xjModel",xjModel);
List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
model.addAttribute("zcModelList",zcModelList);
+ List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ model.addAttribute("xjModelList",xjModelList);
LogObjectHolder.me().set(tCar);
return PREFIX + "tCar_auth.html";
}
@@ -441,7 +456,7 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) throws Exception {
+ public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel) throws Exception {
TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate()));
if(null != tCar1){
throw new Exception("车牌号重复");
@@ -497,8 +512,8 @@
service.setType(Integer.valueOf(serverArray[i]));
if (1 == service.getType()){
service.setServerCarModelId(Integer.valueOf(zcModel));
- }else if (3 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (4 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(xjModel));
}
tCarServiceService.insert(service);
}
@@ -529,7 +544,7 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel)throws Exception {
+ public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel)throws Exception {
TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate()));
if(null != tCar1 && tCar.getId().compareTo(tCar1.getId()) != 0){
throw new Exception("车牌号重复");
@@ -576,8 +591,8 @@
service.setType(Integer.valueOf(serverArray[i]));
if (1 == service.getType()){
service.setServerCarModelId(Integer.valueOf(zcModel));
- }else if (3 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (4 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(xjModel));
}
tCarServiceService.insert(service);
}
--
Gitblit v1.7.1