From 6032c6fcba748dd3f62ae441f92fcd211e7b1f50 Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Mon, 15 Sep 2025 17:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E6=80=A7=E6=89=8B=E7=BB=AD?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusFormalitiesAreConsolidatedServiceImpl.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 f4a97052..7f8f85c4 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
@@ -265,9 +265,22 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFor
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
+            for (Long id : ids) {
+                BusFormalitiesAreConsolidated selected = baseMapper.selectById(id);
+                if (selected == null || !FormalitiesStatusEnum.TOSTART.getText().equals(selected.getProcessingStatus())) {
+                    throw new ServiceException("只能删除待开始数据");
+                }
+                Long count = busFormalitiesAnnexService.getBaseMapper().selectCount(new LambdaQueryWrapper<BusFormalitiesAnnex>()
+                    .eq(BusFormalitiesAnnex::getFormalitiesId, id));
+                if (count > 0L) {
+                    busFormalitiesAnnexService.getBaseMapper().delete(new LambdaQueryWrapper<BusFormalitiesAnnex>()
+                        .eq(BusFormalitiesAnnex::getFormalitiesId, id));
+                }
+            }
         }
         return baseMapper.deleteByIds(ids) > 0;
     }