From e25d138ac2e1a2b271b27bbc1973f0b5898b1d82 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 15:05:11 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 2 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index b9ba993..ff91bee 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -115,7 +115,8 @@
}
//查询当前用户所属分公司/加盟商
model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
-
+ model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
+
//车辆品牌
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
model.addAttribute("brandList",brandList);
@@ -157,7 +158,8 @@
Integer roleType = shiroExtUtil.getUser().getRoleType();
model.addAttribute("roleType", roleType);
model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
-
+ model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
+
if (1 == roleType) {
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
model.addAttribute("companyList", companyList);
@@ -230,6 +232,90 @@
List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("brandId",tCar.getCarBrandId()).eq("state", 1));
model.addAttribute("modelList",modelList);
return PREFIX + "tCar_edit.html";
+ }
+
+ @RequestMapping("/tCar_update1/{tCarId}")
+ public String tCarUpdate1(@PathVariable Integer tCarId, Model model) {
+ TCar tCar = tCarService.selectById(tCarId);
+ model.addAttribute("item", tCar);
+ LogObjectHolder.me().set(tCar);
+
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
+ model.addAttribute("roleType", roleType);
+ model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
+ model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
+ if (1 == roleType) {
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
+ model.addAttribute("companyList", companyList);
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId", tCar.getCompanyId()).eq("state", 0).ne("flag", 3));
+ model.addAttribute("franchiseeList", franchiseeList);
+ } else if (2 == roleType) {
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId", shiroExtUtil.getUser().getObjectId()).eq("state", 0).ne("flag", 3));
+ model.addAttribute("franchiseeList", franchiseeList);
+ }
+
+ //查询平台ID
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ //判断是平台司机还是加盟司机
+ if ((SinataUtil.isEmpty(tCar.getCompanyId()) || tCar.getCompanyId() == 0 || tCar.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tCar.getFranchiseeId()) || tCar.getFranchiseeId() == 0)){
+ model.addAttribute("companyType",1);
+ }else{
+ model.addAttribute("companyType",2);
+ }
+
+ //获取经营业务
+ List<TCarService> serviceList = tCarServiceService.selectList(new EntityWrapper<TCarService>().eq("carId", tCar.getId()));
+ Integer one = 1;
+ Integer two = 1;
+ Integer three = 1;
+ Integer four = 1;
+ Integer five = 1;
+ Integer six = 1;
+ Integer zcModel = 0;
+ Integer kcModel = 0;
+ for (TCarService obj : serviceList){
+ if (obj.getType() == 1){
+ one = 2;
+ zcModel = obj.getServerCarModelId();
+ }
+ if (obj.getType() == 2){
+ two = 2;
+ }
+ if (obj.getType() == 3){
+ three = 2;
+ kcModel = obj.getServerCarModelId();
+ }
+ if (obj.getType() == 4){
+ four = 2;
+ }
+ if (obj.getType() == 5){
+ five = 2;
+ }
+ if (obj.getType() == 6){
+ six = 2;
+ }
+ }
+ model.addAttribute("one",one);
+ model.addAttribute("two",two);
+ model.addAttribute("three",three);
+ model.addAttribute("four",four);
+ model.addAttribute("five",five);
+ model.addAttribute("six",six);
+ model.addAttribute("zcModel",zcModel);
+ model.addAttribute("kcModel",kcModel);
+
+ 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<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
+ model.addAttribute("brandList",brandList);
+ //车辆类型
+ List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("brandId",tCar.getCarBrandId()).eq("state", 1));
+ model.addAttribute("modelList",modelList);
+ return PREFIX + "tCar_edit1.html";
}
@@ -611,6 +697,17 @@
}).start();
return SUCCESS_TIP;
}
+ @RequestMapping(value = "/update1")
+ @ResponseBody
+ public Object update1(TCar tCar,String bindDriverId) {
+ TCar obj = tCarService.selectById(tCar.getId());
+ if(bindDriverId==null){
+ bindDriverId="";
+ }
+ obj.setBindDriverId(bindDriverId);
+ tCarService.updateById(obj);
+ return SUCCESS_TIP;
+ }
/**
* 车辆管理详情
--
Gitblit v1.7.1