From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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 6c6f621..43981ca 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
@@ -441,7 +441,12 @@
*/
@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) 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("车牌号重复");
+ }
+
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -524,7 +529,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) {
+ public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel)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("车牌号重复");
+ }
+
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -612,17 +622,19 @@
try {
String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- document.getElementById("invite1").attr("style", "display: none;");
- document.getElementById("user1").attr("style", "display: none;");
- document.getElementById("settle1").attr("style", "display: none;");
- document.getElementById("pass1").attr("style", "display: none;");
- document.getElementById("email1").attr("style", "display: none;");
- document.getElementById("bill1").attr("style", "display: none;");
- document.getElementById("reward1").attr("style", "display: none;");
- document.getElementById("rewardToday1").attr("style", "display: none;");
- document.getElementById("driverAudit1").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite1").remove();
+ document.getElementById("user1").remove();
+ document.getElementById("settle1").remove();
+ document.getElementById("pass1").remove();
+ document.getElementById("email1").remove();
+ document.getElementById("bill1").remove();
+ document.getElementById("reward1").remove();
+ document.getElementById("rewardToday1").remove();
+ document.getElementById("driverAudit1").remove();
+
+ document.getElementsByTag("title").get(0).text(2 == finalTCar.getAuthState() ? "Vehicle is verified and qualified" : "Vehicle is not verified and qualified");
Element car_audit1_user = document.getElementById("car_audit1_user");
car_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
Element car_audit1_content = document.getElementById("car_audit1_content");
@@ -631,7 +643,7 @@
}else{
car_audit1_content.text("Sorry, your vehicle application was not approved. The reason for the failure is: incomplete filling of vehicle information.");
}
- EmailUtil.send(tDriver.getEmail(), "Vehicle audit notice", document.html());
+ EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "Vehicle is verified and qualified" : "Vehicle is not verified and qualified", document.html());
}catch (Exception e){
e.printStackTrace();
}
--
Gitblit v1.7.1