From c955dca0468c594c5a379696a44e9426f583da33 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 25 Jul 2024 18:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=E9=97=B4=E4=B8=8D=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../car/controller/CarInfoController.java     | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
index 0cafa2171..4856db8d9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
@@ -219,17 +219,7 @@ public class CarInfoController {
             if (outsideDriverIdCard != null) {
                 carInfo.setOutsideDriverIdCard(outsideDriverIdCard.toString());
             }
-            try {
-                carInfoService.validEnterpriseTime(carInfo);
-            } catch (OpenAlertException e) {
-                //在最后一级审批人审批的时候也需要做以上同样的判断，因为可能会出现两个不同企业的人员同时提出了有冲突预约时间的车辆入场审批申请。这时候，让审批正常通过，但是不处理这条数据，不同步到后台，只用发送通知提醒项目账号和发起人、审批人账号。
-                //通知内容：车辆【辽A12345】预约失败，此预约时间段内，车辆已经被其他企业预约了！
-                List<String> collect = getUserIds(carInfo.getProjectSn(), carInfo.getUserIds());
-                for (String s : collect) {
-                    noticeService.addUserNotice(Long.valueOf(s), "新增车辆通知", StrUtil.format("车辆【{}】预约失败，此预约时间段内，车辆已经被其他企业预约了！", carInfo.getCarNumber()),
-                            "24");
-                }
-            }
+            carInfo.setFromFlow(true);
             QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
                     .eq(CarInfo::getCarNumber, carInfo.getCarNumber());
@@ -240,15 +230,29 @@ public class CarInfoController {
                     noticeService.addUserNotice(Long.valueOf(s), "新增车辆通知", StrUtil.format("【({})车辆已被拉黑，无法再进行新增】", carInfo.getCarNumber()),
                             "24");
                 }
-            } else if (DateUtil.compare(carInfo.getReserveEndTime(), new Date()) < 0) {
+                return Result.ok();
+            }
+            try {
+                carInfoService.validEnterpriseTime(carInfo);
+            } catch (OpenAlertException e) {
+                //在最后一级审批人审批的时候也需要做以上同样的判断，因为可能会出现两个不同企业的人员同时提出了有冲突预约时间的车辆入场审批申请。这时候，让审批正常通过，但是不处理这条数据，不同步到后台，只用发送通知提醒项目账号和发起人、审批人账号。
+                //通知内容：车辆【辽A12345】预约失败，此预约时间段内，车辆已经被其他企业预约了！
+                List<String> collect = getUserIds(carInfo.getProjectSn(), carInfo.getUserIds());
+                for (String s : collect) {
+                    noticeService.addUserNotice(Long.valueOf(s), "新增车辆通知", StrUtil.format("车辆【{}】预约失败，此预约时间段内，车辆已经被其他企业预约了！", carInfo.getCarNumber()),
+                            "24");
+                }
+                return Result.ok();
+            }
+            if (DateUtil.compare(carInfo.getReserveEndTime(), new Date()) < 0) {
                 List<String> collect = getUserIds(carInfo.getProjectSn(), carInfo.getUserIds());
                 for (String s : collect) {
                     noticeService.addUserNotice(Long.valueOf(s), "车辆下发道闸通知", StrUtil.format("【预约时间已过期，({})车辆无法下发】", carInfo.getCarNumber()),
                             "24");
                 }
-            } else {
-                carInfoService.addCarInfo(carInfo);
+                return Result.ok();
             }
+            carInfoService.addCarInfo(carInfo);
         } catch (Exception e) {
             log.error("添加车辆黑白名单管理信息", e);
             emailUtils.sendFlowEmail(paramStr, e, "添加车辆", "/xmgl/carInfo/save");