From b072235a80863d6b8cb14b4b6d58815069609a82 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 二月 2026 10:52:52 +0800
Subject: [PATCH] 已领用的危险源台账删除时，做提示限制
---
src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java | 21 +++++++++++++++++++++
src/main/java/com/ruoyi/safe/controller/SafeHazardController.java | 2 +-
src/main/java/com/ruoyi/safe/service/SafeHazardService.java | 4 ++++
3 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
index 172d491..60aa9ee 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
@@ -50,7 +50,7 @@
@ApiOperation("鍒犻櫎鍗遍櫓婧愬彴璐�")
@DeleteMapping("/{ids}")
public R delSafeHazard(@RequestBody List<Integer> ids) {
- return R.ok(safeHazardService.removeBatchByIds(ids));
+ return R.ok(safeHazardService.delSafeHazard(ids));
}
}
diff --git a/src/main/java/com/ruoyi/safe/service/SafeHazardService.java b/src/main/java/com/ruoyi/safe/service/SafeHazardService.java
index e407ef6..0917131 100644
--- a/src/main/java/com/ruoyi/safe/service/SafeHazardService.java
+++ b/src/main/java/com/ruoyi/safe/service/SafeHazardService.java
@@ -5,6 +5,8 @@
import com.ruoyi.safe.pojo.SafeHazard;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* <p>
* 瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐� 鏈嶅姟绫�
@@ -16,4 +18,6 @@
public interface SafeHazardService extends IService<SafeHazard> {
IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard);
+
+ int delSafeHazard(List<Integer> ids);
}
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
index de7efc7..18939e6 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
@@ -1,13 +1,18 @@
package com.ruoyi.safe.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.mapper.SafeHazardMapper;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
import com.ruoyi.safe.service.SafeHazardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -23,8 +28,24 @@
@Autowired
private SafeHazardMapper safeHazardMapper;
+ @Autowired
+ private SafeHazardRecordMapper safeHazardRecordMapper;
+
@Override
public IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard) {
return safeHazardMapper.pageSafeHazard(page, safeHazard);
}
+
+ @Override
+ public int delSafeHazard(List<Integer> ids) {
+ //鍒ゆ柇鏄惁鏈夋鍦ㄩ鐢ㄧ殑鍗遍櫓婧�
+ List<SafeHazardRecord> safeHazardRecords = safeHazardRecordMapper.selectList(Wrappers.<SafeHazardRecord>lambdaQuery()
+ .in(SafeHazardRecord::getSafeHazardId, ids)
+ .isNull(SafeHazardRecord::getReturnUserId));
+ if (safeHazardRecords.size()>0){
+ throw new RuntimeException("璇ュ嵄闄╂簮宸茬粡棰嗙敤,鏃犳硶鍒犻櫎,绛夊綊杩樹箣鍚庡啀杩涜鍒犻櫎!");
+ }
+ safeHazardMapper.deleteBatchIds(ids);
+ return 0;
+ }
}
--
Gitblit v1.9.3