From c5c88541f152a1b864d418cdf8df3967e8307a36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 24 一月 2026 09:34:31 +0800
Subject: [PATCH] 代码提交
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProblemDetailVo.java | 59 +++++++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java | 29 ++++++++------
2 files changed, 75 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..1982458 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(record);
+ }
+ @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,8 @@
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);
- }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProblemDetailVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProblemDetailVo.java
new file mode 100644
index 0000000..908c0ee
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProblemDetailVo.java
@@ -0,0 +1,59 @@
+package com.ruoyi.system.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.parsing.Problem;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * DTO for {@link Problem}
+ */
+@ApiModel(value = "隐患详情VO")
+@Data
+public class ProblemDetailVo {
+
+ @ApiModelProperty(value = "id")
+ Integer id;
+ @ApiModelProperty(value = "责任人")
+ String responsiblePerson;
+
+ @ApiModelProperty(value = "计划名称")
+ String planName;
+
+ @ApiModelProperty(value = "项目名称")
+ String hierarchyPath;
+
+ @ApiModelProperty(value = "检查内容")
+ String hierarchyName;
+ @ApiModelProperty(value = "问题部位")
+ String problemPart;
+ @ApiModelProperty(value = "规范与条款")
+ private List<String> specificTerms;
+ @ApiModelProperty(value = "建议措施")
+ private List<String> suggestActions;
+ @ApiModelProperty(value = "问题数量集合")
+ List<String> numberFactors;
+ @ApiModelProperty(value = "数值")
+ Float numValue;
+
+
+ @ApiModelProperty(value = "点评范式")
+ String reviewParadigm;
+
+
+ @ApiModelProperty(value = "责任部门")
+ String responsibleDepartment;
+
+
+ @ApiModelProperty(value = "正确做法")
+ String correctPractice;
+
+ String numberFactorsStr;
+
+
+}
\ No newline at end of file
--
Gitblit v1.7.1