From fed0ab88a2fe5b9d889ec645460263aac9ef6c63 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 一月 2025 15:50:52 +0800
Subject: [PATCH] 补充
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 3508ea4..e6460e7 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -396,8 +396,8 @@
public Object add(TCar tCar, String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
// 判断车牌号是否存在
- if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())) > 0){
- return ResultUtil.runErr("车牌号已存在");
+ if (tCarService.selectCount(new EntityWrapper<TCar>().eq("state", 1).eq("carLicensePlate", tCar.getCarLicensePlate())) > 0){
+ return ResultUtil.error("车牌号已存在");
}
if (1 == roleType){ //平台
@@ -500,11 +500,12 @@
@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) {
-
+ int i1 = tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
+ .ne("id", tCar.getId())
+ .eq("state", 1));
// 判断车牌号是否存在
- if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
- .ne("id", tCar.getId())) > 0){
- return ResultUtil.runErr("车牌号已存在");
+ if ( i1> 0){
+ return ResultUtil.error("车牌号已存在");
}
if (1 == roleType){ //平台
@@ -601,7 +602,7 @@
shellList.add("服务模式:包车[是/否]");
shellList.add("车辆品牌");
shellList.add("车辆类型");
- shellList.add("车辆颜色[蓝白色/绿色]");
+ shellList.add("车辆颜色[蓝白色/绿色/黄色]");
shellList.add("车牌号");
dataList.add(shellList);
@@ -768,7 +769,7 @@
return new ErrorTip(500, "服务模式【包车】内容不正确");
}
//判断车辆颜色
- if (!eleven.equals("蓝白色") && !eleven.equals("绿色") ){
+ if (!eleven.equals("蓝白色") && !eleven.equals("绿色") && !eleven.equals("黄色") ){
return new ErrorTip(500, "车辆颜色内容不正确");
}
//判断年检到期时间格式是否正确
--
Gitblit v1.7.1