From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
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..a2cbc96 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.pojo.SafeHazard;
-import com.ruoyi.safe.mapper.SafeHazardMapper;
-import com.ruoyi.safe.service.SafeHazardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.safe.mapper.SafeHazardMapper;
+import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.ruoyi.safe.service.SafeHazardService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -18,13 +23,28 @@
* @since 2026-01-28 10:09:24
*/
@Service
+@RequiredArgsConstructor
public class SafeHazardServiceImpl extends ServiceImpl<SafeHazardMapper, SafeHazard> implements SafeHazardService {
- @Autowired
- private SafeHazardMapper safeHazardMapper;
+ private final SafeHazardMapper safeHazardMapper;
+
+ private final 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