From 326c87fed063066712ebb9e408a30d669f8681d3 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 17 Jun 2024 09:36:08 +0800
Subject: [PATCH] 添加
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
index aaff7cf..ff8f8a9 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
@@ -49,12 +49,17 @@
- @GetMapping()
- public String selectTbBaseCheckTaskPage(ModelMap mmap)
+// @GetMapping()
+// public String selectTbBaseCheckTaskPage(ModelMap mmap)
+// {
+// return prefix + "/specialCheckItemDangerLog";
+// }
+ @GetMapping("{id}")
+ public String specialCheckItemDangerLog(@PathVariable("id")String id,ModelMap modelMap)
{
+ modelMap.put("id",id);
return prefix + "/specialCheckItemDangerLog";
}
-
@PostMapping("/list")
@@ -64,6 +69,16 @@
ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();
+
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ for (TbSpecialCheckItemDangerLogDTO log : data) {
+ for (PreventCJReportDangerInfo danger : dangerList) {
+ if (danger.getId().equals(log.getDangerId())){
+ log.setDangerName(danger.getDangerName());
+ }
+ }
+ }
+
TableDataInfo dataTable = getDataTable(data);
dataTable.setTotal(resultVO.getCount());
--
Gitblit v1.9.2