From 6681665f66b71633182eec48597c952834843a1d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 一月 2026 17:06:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java | 30 +++++++++++++++++-------------
1 files changed, 17 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 3de17ea..ca978bd 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
@@ -156,6 +156,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 +179,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/{problemId}")
- public R<?> getHiddenDangerDetail(@PathVariable Integer problemId) {
- var record = recordService.getHiddenDangerDetail(problemId);
- return R.ok(record);
- }
+
+
}
--
Gitblit v1.7.1