From 0c82398dad95f536e22b5e1966f79aa29b2cf1c9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 七月 2025 19:34:39 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 74 ++++---------------------------------
1 files changed, 8 insertions(+), 66 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 041d445..e8820dd 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
@@ -58,9 +58,6 @@
private ITCarServiceService tCarServiceService;
@Autowired
- private ITDriverLineService tDriverLineService;
-
- @Autowired
private ITCarBrandService tCarBrandService;
@Autowired
@@ -619,9 +616,6 @@
shellList.add("服务模式:快车[是/否]");
shellList.add("服务模式:出租车[是/否]");
shellList.add("服务模式:跨城出行[是/否]");
- shellList.add("服务模式:小件同城物流[是/否]");
- shellList.add("服务模式:小件跨城物流[是/否]");
- shellList.add("服务模式:包车[是/否]");
shellList.add("车辆品牌");
shellList.add("车辆类型");
shellList.add("车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]");
@@ -698,69 +692,50 @@
five = String.valueOf(cell5.getStringCellValue()).trim();
}
- Cell cell6 = row.getCell(6); //服务模式:小件跨城物流[是/否]
- String six = null;
- if (SinataUtil.isNotEmpty(cell6)){
- six = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
- Cell cell7 = row.getCell(7); //服务模式:小件跨城物流[是/否]
- String seven = null;
- if (SinataUtil.isNotEmpty(cell7)){
- seven = String.valueOf(cell7.getStringCellValue()).trim();
- }
-
- Cell cell8 = row.getCell(8); //服务模式:包车[是/否]
- String eight = null;
- if (SinataUtil.isNotEmpty(cell8)){
- eight = String.valueOf(cell8.getStringCellValue()).trim();
- }
-
- Cell cell9 = row.getCell(9); //车辆品牌
+ Cell cell9 = row.getCell(6); //车辆品牌
String nine = null;
if (SinataUtil.isNotEmpty(cell9)){
nine = String.valueOf(cell9.getStringCellValue()).trim();
}
- Cell cell10 = row.getCell(10); //车辆类型
+ Cell cell10 = row.getCell(7); //车辆类型
String ten = null;
if (SinataUtil.isNotEmpty(cell10)){
ten = String.valueOf(cell10.getStringCellValue()).trim();
}
- Cell cell11 = row.getCell(11); //车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]
+ Cell cell11 = row.getCell(8); //车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]
String eleven = null;
if (SinataUtil.isNotEmpty(cell11)){
eleven = String.valueOf(cell11.getStringCellValue()).trim();
}
- Cell cell12 = row.getCell(12); //车牌号
+ Cell cell12 = row.getCell(9); //车牌号
String twelve = null;
if (SinataUtil.isNotEmpty(cell12)){
twelve = String.valueOf(cell12.getStringCellValue()).trim();
}
- Cell cell13 = row.getCell(13); //行驶证编号
+ Cell cell13 = row.getCell(10); //行驶证编号
String thirteen = null;
if (SinataUtil.isNotEmpty(cell13)){
thirteen = String.valueOf(cell13.getStringCellValue()).trim();
}
- Cell cell14 = row.getCell(14); //年检到期时间
+ Cell cell14 = row.getCell(11); //年检到期时间
String fourteen = null;
if (SinataUtil.isNotEmpty(cell14)){
fourteen = String.valueOf(cell14.getStringCellValue()).trim();
}
- Cell cell15 = row.getCell(15); //商业保险到期时间
+ Cell cell15 = row.getCell(12); //商业保险到期时间
String fifteen = null;
if (SinataUtil.isNotEmpty(cell15)){
fifteen = String.valueOf(cell15.getStringCellValue()).trim();
}
if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
- || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(seven)
- || SinataUtil.isEmpty(eight) || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
+ || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
|| SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
|| SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen)){
return new ErrorTip(500, "单元格不能为空");
@@ -780,18 +755,6 @@
//判断服务模式【跨城出行】
if (!five.equals("是") && !five.equals("否")){
return new ErrorTip(500, "服务模式【跨城出行】内容不正确");
- }
- //判断服务模式【小件同城物流】
- if (!six.equals("是") && !six.equals("否")){
- return new ErrorTip(500, "服务模式【小件同城物流】内容不正确");
- }
- //判断服务模式【小件跨城物流】
- if (!seven.equals("是") && !seven.equals("否")){
- return new ErrorTip(500, "服务模式【小件跨城物流】内容不正确");
- }
- //判断服务模式【包车】
- if (!eight.equals("是") && !eight.equals("否")){
- return new ErrorTip(500, "服务模式【包车】内容不正确");
}
//判断车辆颜色
if (!eleven.equals("黑色") && !eleven.equals("银色") && !eleven.equals("白色") && !eleven.equals("红色") && !eleven.equals("黄色") && !eleven.equals("橙色") && !eleven.equals("蓝色")){
@@ -900,27 +863,6 @@
TCarService service = new TCarService();
service.setCarId(car.getId());
service.setType(3);
- tCarServiceService.insert(service);
- }
- //添加小件同城物流服务模式
- if ("是".equals(six)){
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(4);
- tCarServiceService.insert(service);
- }
- //添加小件跨城物流服务模式
- if ("是".equals(seven)){
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(5);
- tCarServiceService.insert(service);
- }
- //添加包车服务模式
- if ("是".equals(eight)){
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(6);
tCarServiceService.insert(service);
}
}
--
Gitblit v1.7.1