From b1f2f102034b4433201225b67a9fc78c08e532f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 六月 2025 18:35:03 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 174 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 101 insertions(+), 73 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 2466814..9c82640 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
@@ -5,11 +5,9 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.ErrorTip;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
-import com.stylefeng.guns.core.util.DateUtil;
-import com.stylefeng.guns.core.util.ExcelExportUtil;
-import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.core.util.WoUtil;
+import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.modular.system.dao.CarInsuranceMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -23,12 +21,11 @@
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -101,11 +98,15 @@
public String index() {
return PREFIX + "tCar.html";
}
+
+
@RequestMapping("auth")
public String auth() {
return PREFIX + "tCarAuth.html";
}
+
+
/**
* 跳转到添加车辆管理
*/
@@ -184,7 +185,7 @@
//查询平台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)){
+ if (tCar.getCompanyId() == 1){
model.addAttribute("companyType",1);
}else{
model.addAttribute("companyType",2);
@@ -251,6 +252,8 @@
model.addAttribute("color", state);
return PREFIX + "tCar_edit.html";
}
+
+
@RequestMapping("/tCar_auth/{tCarId}")
public String tCarAuth(@PathVariable Integer tCarId, Model model) {
TCar tCar = tCarService.selectById(tCarId);
@@ -292,6 +295,7 @@
return PREFIX + "tCar_auth.html";
}
+
/**
* 跳转到保险列表页
* @param carId
@@ -468,12 +472,11 @@
tCar.setCompanyId(oneId);
}
if (SinataUtil.isNotEmpty(twoId)){
- tCar.setFranchiseeId(twoId);
+ tCar.setCompanyId(twoId);
}
}else if (1 == companyType.intValue()){
TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
tCar.setCompanyId(company.getId());
- tCar.setFranchiseeId(0);
}
tCar.setAddType(2);
tCar.setIsPlatCar(1);
@@ -482,7 +485,7 @@
tCar.setCompanyId(ShiroKit.getUser().getObjectId());
}
if (SinataUtil.isNotEmpty(franchiseeId)){
- tCar.setFranchiseeId(franchiseeId);
+ tCar.setCompanyId(franchiseeId);
}
tCar.setIsPlatCar(2);
tCar.setAddType(3);
@@ -493,7 +496,7 @@
tCar.setCompanyId(tCompany.getSuperiorId());
}
if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tCar.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ tCar.setCompanyId(ShiroKit.getUser().getObjectId());
}
tCar.setIsPlatCar(2);
tCar.setAddType(4);
@@ -556,19 +559,18 @@
tCar.setCompanyId(oneId);
}
if (SinataUtil.isNotEmpty(twoId)){
- tCar.setFranchiseeId(twoId);
+ tCar.setCompanyId(twoId);
}
}else if (1 == companyType.intValue()){
TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
tCar.setCompanyId(company.getId());
- tCar.setFranchiseeId(0);
}
}else if (2 == roleType){ //分公司
if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
tCar.setCompanyId(ShiroKit.getUser().getObjectId());
}
if (SinataUtil.isNotEmpty(franchiseeId)){
- tCar.setFranchiseeId(franchiseeId);
+ tCar.setCompanyId(franchiseeId);
}
}else if (3 == roleType){ //加盟商
TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
@@ -576,7 +578,7 @@
tCar.setCompanyId(tCompany.getSuperiorId());
}
if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tCar.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ tCar.setCompanyId(ShiroKit.getUser().getObjectId());
}
}
@@ -600,6 +602,8 @@
tCarService.updateById(tCar);
return SUCCESS_TIP;
}
+
+
@RequestMapping(value = "/updateAuth")
@ResponseBody
public Object updateAuth(TCar tCar,String zcModel,String xjModel,@RequestParam String serverBox) {
@@ -627,66 +631,90 @@
tCar = tCarService.selectById(tCar.getId());
TDriver tDriver = tDriverService.selectById(tCar.getDriverId());
- TCar finalTCar = tCar;
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Integer language = tDriver.getLanguage();
- String path = templatePath + "driver/index.html";
- Document document = Jsoup.parse(new File(path), "UTF-8");
- 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();
- if(1 == language){
- document.getElementsByTag("title").get(0).text(2 == finalTCar.getAuthState() ? "车辆审核通过" : "车辆审核不通过");
- 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");
- if(2 == finalTCar.getAuthState()){
- car_audit1_content.html("您的车辆注册申请已获批准<br>详情请查看I-GO APP");
- }else{
- car_audit1_content.html("我们很遗憾地通知您: 您的车辆申请已被拒绝。相关详情，请与我们的客服联系，致电0577777767或发送电子邮件至support@i-go.group");
+ if(null != tDriver && ToolUtil.isNotEmpty(tDriver.getEmail())){
+ TCar finalTCar = tCar;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Integer language = tDriver.getLanguage();
+ String path = templatePath + "driver/index.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite").remove();
+ document.getElementById("user").remove();
+ document.getElementById("settle").remove();
+ document.getElementById("pass").remove();
+ document.getElementById("email").remove();
+ document.getElementById("bill").remove();
+ document.getElementById("reward").remove();
+ document.getElementById("rewardToday").remove();
+ document.getElementById("driverAudit").remove();
+ document.getElementsByTag("title").get(0).text(2 == finalTCar.getAuthState() ? "车辆审核通过" : "车辆审核不通过");
+ 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");
+ if(2 == finalTCar.getAuthState()){
+ car_audit1_content.html("您的车辆注册申请已获批准<br>详情请查看I-GO APP");
+ }else{
+ car_audit1_content.html("我们很遗憾地通知您: 您的车辆申请已被拒绝。相关详情，请与我们的客服联系，致电0577777767或发送电子邮件至support@i-go.group");
+ }
+ EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "车辆审核通过" : "车辆审核不通过", document.html());
}
- EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "车辆审核通过" : "车辆审核不通过", document.html());
- }
- if(2 == language){
- document.getElementsByTag("title").get(0).text(2 == finalTCar.getAuthState() ? "Vehicle is verified and qualified" : "Vehicle is not verified and qualified");
- Element car_audit2_user = document.getElementById("car_audit2_user");
- car_audit2_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
- Element car_audit2_content = document.getElementById("car_audit2_content");
- if(2 == finalTCar.getAuthState()){
- car_audit2_content.html("Your vehicle application has been approved. <br>See the I-GO platform for details.");
- }else{
- car_audit2_content.html("We are sorry to inform you that your vehicle application was rejected. Please contact our service for relevant details, call 0577777767 or send e-mail to support@i-go.group");
+ if(2 == language){
+ 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_audit2_user = document.getElementById("car_audit2_user");
+ car_audit2_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
+ Element car_audit2_content = document.getElementById("car_audit2_content");
+ if(2 == finalTCar.getAuthState()){
+ car_audit2_content.html("Your vehicle application has been approved. <br>See the I-GO platform for details.");
+ }else{
+ car_audit2_content.html("We are sorry to inform you that your vehicle application was rejected. Please contact our service for relevant details, call 0577777767 or send e-mail to support@i-go.group");
+ }
+ EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "Vehicle is verified and qualified" : "Vehicle is not verified and qualified", document.html());
}
- EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "Vehicle is verified and qualified" : "Vehicle is not verified and qualified", document.html());
- }
- if(3 == language){
- document.getElementsByTag("title").get(0).text(2 == finalTCar.getAuthState() ? "Le véhicule est vérifié et qualifié" : "Le véhicule n’est pas vérifié et qualifié");
- Element car_audit3_user = document.getElementById("car_audit3_user");
- car_audit3_user.text("Bonjour " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
- Element car_audit3_content = document.getElementById("car_audit3_content");
- if(2 == finalTCar.getAuthState()){
- car_audit3_content.html("Votre demande de véhicule a été approuvée.<br>Veuillez consulter la plateforme I-GO pour plus de détails.");
- }else{
- car_audit3_content.html("Nous avons le regret de vous informer que votre demande de véhicule a été rejetée. Veuillez contacter notre service pour plus de détails, appelez 0577777767 ou envoyez un e-mail à support@i-go.group");
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementById("invite2").remove();
+ document.getElementById("user2").remove();
+ document.getElementById("settle2").remove();
+ document.getElementById("pass2").remove();
+ document.getElementById("email2").remove();
+ document.getElementById("bill2").remove();
+ document.getElementById("reward2").remove();
+ document.getElementById("rewardToday2").remove();
+ document.getElementById("driverAudit2").remove();
+ document.getElementsByTag("title").get(0).text(2 == finalTCar.getAuthState() ? "Le véhicule est vérifié et qualifié" : "Le véhicule n’est pas vérifié et qualifié");
+ Element car_audit3_user = document.getElementById("car_audit3_user");
+ car_audit3_user.text("Bonjour " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
+ Element car_audit3_content = document.getElementById("car_audit3_content");
+ if(2 == finalTCar.getAuthState()){
+ car_audit3_content.html("Votre demande de véhicule a été approuvée.<br>Veuillez consulter la plateforme I-GO pour plus de détails.");
+ }else{
+ car_audit3_content.html("Nous avons le regret de vous informer que votre demande de véhicule a été rejetée. Veuillez contacter notre service pour plus de détails, appelez 0577777767 ou envoyez un e-mail à support@i-go.group");
+ }
+ EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "Le véhicule est vérifié et qualifié" : "Le véhicule n’est pas vérifié et qualifié", document.html());
}
- EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "Le véhicule est vérifié et qualifié" : "Le véhicule n’est pas vérifié et qualifié", document.html());
+ }catch (Exception e){
+ e.printStackTrace();
}
- }catch (Exception e){
- e.printStackTrace();
}
- }
- }).start();
+ }).start();
+ }
return SUCCESS_TIP;
}
@@ -958,8 +986,7 @@
}else if ("加盟车辆".equals(zero)){
car.setIsPlatCar(2);
}
- car.setCompanyId(companyId);
- car.setFranchiseeId(franchiseeId);
+ car.setCompanyId(0 == franchiseeId ? franchiseeId : companyId);
car.setCarColor(eleven);
car.setCarBrandId(carBrandId);
car.setCarModelId(carModelId);
@@ -969,6 +996,7 @@
car.setCommercialInsuranceTime(DateUtil.parseDate(fifteen));
car.setInsertTime(new Date());
car.setState(1);
+ car.setAuthState(2);
if (ShiroKit.getUser().getRoleType() == 1){
car.setAddType(2);
}else if (ShiroKit.getUser().getRoleType() == 2){
--
Gitblit v1.7.1