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/controller/general/TCarController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 4ad7d8b..c96c0de 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -119,13 +119,15 @@
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
model.addAttribute("brandList",brandList);
//车辆类型
- /*List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("state", 1));
+ /*List<TCharteredService> modelList = tCarModelService.selectList(new EntityWrapper<TCharteredService>().eq("state", 1));
model.addAttribute("modelList",modelList);*/
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> jsjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
+ model.addAttribute("jsjModelList",jsjModelList);
return PREFIX + "tCar_add.html";
}
@@ -184,8 +186,10 @@
Integer four = 1;
Integer five = 1;
Integer six = 1;
+ Integer seven = 1;
Integer zcModel = 0;
Integer kcModel = 0;
+ Integer jsjModel = 0;
for (TCarService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -207,6 +211,10 @@
if (obj.getType() == 6){
six = 2;
}
+ if (obj.getType() == 7){
+ seven = 2;
+ jsjModel = obj.getServerCarModelId();
+ }
}
model.addAttribute("one",one);
model.addAttribute("two",two);
@@ -214,13 +222,17 @@
model.addAttribute("four",four);
model.addAttribute("five",five);
model.addAttribute("six",six);
+ model.addAttribute("seven",seven);
model.addAttribute("zcModel",zcModel);
model.addAttribute("kcModel",kcModel);
+ model.addAttribute("jsjModel",jsjModel);
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> jsjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
+ model.addAttribute("jsjModelList",jsjModelList);
//车辆品牌
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
@@ -393,7 +405,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) {
+ public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String jsjModel) {
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -445,6 +457,8 @@
service.setServerCarModelId(Integer.valueOf(zcModel));
}else if (3 == service.getType()){
service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (7 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(jsjModel));
}
tCarServiceService.insert(service);
}
@@ -495,7 +509,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) {
+ public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String jsjModel) {
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -539,6 +553,8 @@
service.setServerCarModelId(Integer.valueOf(zcModel));
}else if (3 == service.getType()){
service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (7 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(jsjModel));
}
tCarServiceService.insert(service);
}
@@ -581,7 +597,7 @@
shellList.add("所属加盟商[提示:加盟车辆选填]");
shellList.add("服务模式:专车[是/否]");
shellList.add("服务模式:出租车[是/否]");
- shellList.add("服务模式:直通车[是/否]");
+ shellList.add("服务模式:跨城[是/否]");
shellList.add("服务模式:小件同城物流[是/否]");
shellList.add("服务模式:小件跨城物流[是/否]");
shellList.add("服务模式:包车[是/否]");
@@ -742,7 +758,7 @@
}
//判断服务模式【跨城出行】
if (!five.equals("是") && !five.equals("否")){
- return new ErrorTip(500, "服务模式【直通车】内容不正确");
+ return new ErrorTip(500, "服务模式【跨城】内容不正确");
}
//判断服务模式【小件同城物流】
if (!six.equals("是") && !six.equals("否")){
--
Gitblit v1.7.1