From 9459f21477770ce1d869adeeb9df947fc21c96ca Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 17 六月 2024 10:23:31 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 7337210..914c68f 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
@@ -1,5 +1,6 @@
package com.ruoyi.project.tr.specialCheck.controller;
+import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -49,12 +50,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")
@@ -65,14 +71,6 @@
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