From 64de92ae028b582b7fbe8d3c84eb568edf0d400f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 七月 2026 13:49:37 +0800
Subject: [PATCH] feat: 安全设施巡检调整
---
src/main/java/com/ruoyi/safe/controller/SafeFacilityLedgerController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeFacilityLedgerController.java b/src/main/java/com/ruoyi/safe/controller/SafeFacilityLedgerController.java
index a17f0a3..29166ec 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeFacilityLedgerController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeFacilityLedgerController.java
@@ -5,8 +5,10 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeFacilityInspection;
+import com.ruoyi.safe.pojo.SafeFacilityInspectionTask;
import com.ruoyi.safe.pojo.SafeFacilityLedger;
import com.ruoyi.safe.service.SafeFacilityInspectionService;
+import com.ruoyi.safe.service.SafeFacilityInspectionTaskService;
import com.ruoyi.safe.service.SafeFacilityLedgerService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -31,6 +33,7 @@
private SafeFacilityLedgerService safeFacilityLedgerService;
private SafeFacilityInspectionService safeFacilityInspectionService;
+ private SafeFacilityInspectionTaskService safeFacilityInspectionTaskService;
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ")
@@ -78,6 +81,15 @@
public R delSafeFacilityLedger(@PathVariable List<Integer> ids) {
// 鏍￠獙璁炬柦鏄惁鏈夊叧鑱旂殑宸℃璁板綍
for (Integer id : ids) {
+ long taskCount = safeFacilityInspectionTaskService.lambdaQuery()
+ .eq(SafeFacilityInspectionTask::getFacilityId, id)
+ .count();
+ if (taskCount > 0) {
+ SafeFacilityLedger ledger = safeFacilityLedgerService.getById(id);
+ String name = ledger != null ? ledger.getFacilityName() : String.valueOf(id);
+ return R.fail("璁炬柦銆�" + name + "銆嶅瓨鍦ㄥ叧鑱旂殑宸℃浠诲姟锛屾棤娉曞垹闄�");
+ }
+
long count = safeFacilityInspectionService.lambdaQuery()
.eq(com.ruoyi.safe.pojo.SafeFacilityInspection::getFacilityId, id)
.count();
--
Gitblit v1.9.3