From d2f07163fc4074f335986dd51eedbdc7be9e19ea Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 七月 2026 11:52:47 +0800
Subject: [PATCH] fix: 线路巡检调整
---
src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java b/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java
index b5a9f5d..63f7766 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java
@@ -5,6 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.safe.dto.SafeLineInspectionExecuteDto;
import com.ruoyi.safe.pojo.SafeLineInspection;
import com.ruoyi.safe.pojo.SafeLineInspectionHazard;
import com.ruoyi.safe.pojo.SafeLineInspectionRecord;
@@ -16,7 +17,6 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import java.time.LocalDateTime;
import java.util.List;
/**
@@ -86,7 +86,7 @@
.count() > 0;
}
- @Operation(summary = "瀹屾垚宸℃")
+ @Operation(summary = "搴熷純鏃у贰妫�瀹屾垚鎺ュ彛")
@Log(title = "绾胯矾宸℃", businessType = BusinessType.UPDATE)
@PutMapping("/complete/{id}")
public R complete(@PathVariable Integer id) {
@@ -94,21 +94,21 @@
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("瀛樺湪鏈暣鏀圭殑闅愭偅锛岃鍏堝畬鎴愰殣鎮ｆ暣鏀�");
+ if ("宸插畬鎴�".equals(inspection.getStatus())) {
+ return R.fail("宸℃浠诲姟宸插畬鎴愶紝璇峰嬁閲嶅鎿嶄綔");
}
+ return R.fail("璇烽�氳繃鎵ц宸℃鎻愪氦姝ｅ父缁撴灉锛涘紓甯歌褰曡鍦ㄦ暣鏀硅窡韪腑鐢辨暣鏀硅矗浠讳汉瀹屾垚鏁存敼");
+ }
- Long currentUserId = SecurityUtils.getUserId();
- inspection.setStatus("宸插畬鎴�");
- inspection.setUpdateTime(LocalDateTime.now());
- inspection.setUpdateUser(currentUserId.intValue());
-
- return R.ok(safeLineInspectionService.updateById(inspection));
+ @Operation(summary = "鎵ц宸℃")
+ @Log(title = "绾胯矾宸℃", businessType = BusinessType.UPDATE)
+ @PutMapping("/execute")
+ public R execute(@RequestBody SafeLineInspectionExecuteDto executeDto) {
+ try {
+ return R.ok(safeLineInspectionService.executeInspection(executeDto));
+ } catch (IllegalArgumentException e) {
+ return R.fail(e.getMessage());
+ }
}
@Operation(summary = "鍒犻櫎绾胯矾宸℃浠诲姟")
--
Gitblit v1.9.3