From 2f57979a411c252169100038fd04a8b61c0c3644 Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Mon, 15 Sep 2025 19:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E6=80=A7=E6=89=8B=E7=BB=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/formalities/enums/FormalitiesStatusEnum.java | 3 ++-
 .../impl/BusFormalitiesAreConsolidatedServiceImpl.java   | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/enums/FormalitiesStatusEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/enums/FormalitiesStatusEnum.java
index 895422f3..3b69e780 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/enums/FormalitiesStatusEnum.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/enums/FormalitiesStatusEnum.java
@@ -7,7 +7,8 @@ public enum FormalitiesStatusEnum {
 
     TOSTART("待开始", "0"),
     PROCESSING("处理中", "1"),
-    DELETE("已完成", "2");
+    DELETE("已完成", "2"),
+    NOHANDLE("不需要办理", "3");
 
     private final String text;
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
index 7f8f85c4..048389d3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
@@ -252,7 +252,8 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFor
         //TODO 做一些数据校验,如唯一约束
         if (!FormalitiesStatusEnum.TOSTART.getText().equals(entity.getProcessingStatus())
             && !FormalitiesStatusEnum.PROCESSING.getText().equals(entity.getProcessingStatus())
-            && !FormalitiesStatusEnum.DELETE.getText().equals(entity.getProcessingStatus())) {
+            && !FormalitiesStatusEnum.DELETE.getText().equals(entity.getProcessingStatus())
+            && !FormalitiesStatusEnum.NOHANDLE.getText().equals(entity.getProcessingStatus())) {
             throw new ServiceException("办理状态错误！！");
         }
     }
@@ -295,6 +296,12 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFor
             throw new ServiceException("数据不存在");
         }
 
+        if (FormalitiesStatusEnum.NOHANDLE.getText().equals(bo.getProcessingStatus())){
+            if (!FormalitiesStatusEnum.TOSTART.getText().equals(busFormalitiesAreConsolidated.getProcessingStatus())) {
+                throw new ServiceException("只有待开始数据能修改为’不需要办理‘状态");
+            }
+        }
+
         busFormalitiesAreConsolidated.setProcessingStatus(bo.getProcessingStatus());
         if (FormalitiesStatusEnum.DELETE.getText().equals(busFormalitiesAreConsolidated.getProcessingStatus())) {
             if (busFormalitiesAreConsolidated.getHead() == null) {