From 049c08ee863ff97e0cc4675e392b698a7b10b48f Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 29 一月 2026 14:26:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
index 395cf91..0206f69 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@RestController
@RequestMapping("/projectEntrust")
@@ -107,6 +108,7 @@
public R<Page<ErrorListVo>> errorList(@RequestBody @Valid ErrorListQuery query) {
Page<ErrorListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
List<ErrorListVo> list = deviceUsageService.errorList(page, query);
+
for (ErrorListVo errorListVo : list) {
List<Integer> recordFileIds = recordImageService.lambdaQuery()
.eq(RecordImage::getRecordId, errorListVo.getId()).list()
@@ -156,6 +158,21 @@
page.setRecords(list);
return R.ok(page);
}
+ @ApiOperation(value = "委托方端隐患详情")
+ @GetMapping("/errorDetail")
+ public R<?> errorDetail(Integer id) {
+ Record record = recordService.getById(id);
+ Integer problemId = record.getProblemId();
+ var res = recordService.getHiddenDangerDetail(problemId);
+ return R.ok(res);
+ }
+ @ApiOperation(value = "获取隐患详情")
+ @GetMapping("/getHiddenDangerDetail/{problemId}")
+ public R<?> getHiddenDangerDetail(@PathVariable Integer problemId) {
+ var record = recordService.getHiddenDangerDetail(problemId);
+ return R.ok(record);
+ }
+
@ApiOperation(value = "设置负责人")
@GetMapping("/setResponsiblePerson")
public R setResponsiblePerson(Integer id , String responsiblePerson) {
@@ -164,20 +181,9 @@
recordService.updateById(record);
return R.ok();
}
-// @ApiOperation(value = "隐患详情")
-// @GetMapping("/errorDetail")
-// public R errorDetail(Integer id) {
-// Record record = recordService.getById(id);
-//
-// return R.ok();
-// }
- @ApiOperation(value = "获取隐患详情")
- @GetMapping("/getHiddenDangerDetail/{id}")
- public R<?> getHiddenDangerDetail(@PathVariable Integer id) {
- var record = recordService.getHiddenDangerDetail(id);
- return R.ok(record);
- }
+
+
}
--
Gitblit v1.7.1