From 21e1f6344369fc0775d1d10642214ab0fd993359 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 七月 2026 10:19:51 +0800
Subject: [PATCH] feat: 添加抽检相关字段和注释
---
src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java b/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java
index ac4ac33..b5a9f5d 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java
@@ -6,6 +6,10 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeLineInspection;
+import com.ruoyi.safe.pojo.SafeLineInspectionHazard;
+import com.ruoyi.safe.pojo.SafeLineInspectionRecord;
+import com.ruoyi.safe.service.SafeLineInspectionHazardService;
+import com.ruoyi.safe.service.SafeLineInspectionRecordService;
import com.ruoyi.safe.service.SafeLineInspectionService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,6 +34,8 @@
public class SafeLineInspectionController {
private SafeLineInspectionService safeLineInspectionService;
+ private SafeLineInspectionHazardService safeLineInspectionHazardService;
+ private SafeLineInspectionRecordService safeLineInspectionRecordService;
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ")
@@ -47,8 +53,15 @@
@Log(title = "绾胯矾宸℃", businessType = BusinessType.INSERT)
@PostMapping()
public R add(@RequestBody SafeLineInspection safeLineInspection) {
- // 鏂板鏃堕粯璁ょ姸鎬佷负"寰呭贰妫�"
+ if (isInspectionCodeExists(safeLineInspection.getInspectionCode(), null)) {
+ return R.fail("宸℃缂栧彿銆�" + safeLineInspection.getInspectionCode() + "銆嶅凡瀛樺湪");
+ }
safeLineInspection.setStatus("寰呭贰妫�");
+ Long currentUserId = SecurityUtils.getUserId();
+ safeLineInspection.setAssignUserId(currentUserId.intValue());
+ if (safeLineInspection.getInspectorId() != null && safeLineInspection.getInspectorId().isEmpty()) {
+ safeLineInspection.setInspectorId(null);
+ }
return R.ok(safeLineInspectionService.save(safeLineInspection));
}
@@ -56,7 +69,21 @@
@Log(title = "绾胯矾宸℃", businessType = BusinessType.UPDATE)
@PutMapping()
public R update(@RequestBody SafeLineInspection safeLineInspection) {
+ if (isInspectionCodeExists(safeLineInspection.getInspectionCode(), safeLineInspection.getId())) {
+ return R.fail("宸℃缂栧彿銆�" + safeLineInspection.getInspectionCode() + "銆嶅凡瀛樺湪");
+ }
+ if (safeLineInspection.getInspectorId() != null && safeLineInspection.getInspectorId().isEmpty()) {
+ safeLineInspection.setInspectorId(null);
+ }
return R.ok(safeLineInspectionService.updateById(safeLineInspection));
+ }
+
+ private boolean isInspectionCodeExists(String code, Integer excludeId) {
+ if (code == null || code.isEmpty()) return false;
+ return safeLineInspectionService.lambdaQuery()
+ .eq(SafeLineInspection::getInspectionCode, code)
+ .ne(excludeId != null, SafeLineInspection::getId, excludeId)
+ .count() > 0;
}
@Operation(summary = "瀹屾垚宸℃")
@@ -66,6 +93,14 @@
SafeLineInspection inspection = safeLineInspectionService.getById(id);
if (inspection == null) {
return R.fail("宸℃浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鏍￠獙鏄惁鏈夋湭鏁存敼鐨勯殣鎮�
+ List<SafeLineInspectionHazard> hazards = safeLineInspectionHazardService.listByInspectionId(id);
+ boolean hasUnrectified = hazards.stream()
+ .anyMatch(h -> !"宸叉暣鏀�".equals(h.getStatus()));
+ if (hasUnrectified) {
+ return R.fail("瀛樺湪鏈暣鏀圭殑闅愭偅锛岃鍏堝畬鎴愰殣鎮ｆ暣鏀�");
}
Long currentUserId = SecurityUtils.getUserId();
@@ -79,7 +114,16 @@
@Operation(summary = "鍒犻櫎绾胯矾宸℃浠诲姟")
@Log(title = "绾胯矾宸℃", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public R delSafeLineInspection(@RequestBody List<Integer> ids) {
+ public R delSafeLineInspection(@PathVariable List<Integer> ids) {
+ for (Integer id : ids) {
+ long recordCount = safeLineInspectionRecordService.lambdaQuery()
+ .eq(SafeLineInspectionRecord::getInspectionId, id).count();
+ long hazardCount = safeLineInspectionHazardService.lambdaQuery()
+ .eq(SafeLineInspectionHazard::getInspectionId, id).count();
+ if (recordCount > 0 || hazardCount > 0) {
+ return R.fail("璇ュ贰妫�浠诲姟瀛樺湪鍏宠仈鐨勫贰妫�璁板綍鎴栭殣鎮ｏ紝鏃犳硶鍒犻櫎");
+ }
+ }
return R.ok(safeLineInspectionService.removeBatchByIds(ids));
}
}
--
Gitblit v1.9.3