From c4d03879953f254ee34c28229e225fe01b56d222 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 17 六月 2024 14:40:02 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 73e84f3..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,8 @@
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;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -42,14 +45,22 @@
@Autowired
private TbBaseCheckService tbBaseCheckService;
+ @Autowired
+ private PreventCJReportDangerInfoService preventCJReportDangerInfoService;
- @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")
@@ -59,6 +70,8 @@
ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();
+
+
TableDataInfo dataTable = getDataTable(data);
dataTable.setTotal(resultVO.getCount());
@@ -66,20 +79,21 @@
}
/**
- * 新增任务
+ * 新增
*/
@GetMapping("/add")
public String add(ModelMap mmap)
{
- ResultVO<List<RiskList>> resultVO = riskListService.listHazardSource();
- Object data = resultVO.getData();
- mmap.put("hazardList", data);
+ List<RiskList> riskList = riskListService.listHazardSource();
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ mmap.put("hazardList", riskList);
+ mmap.put("dangerList", dangerList);
return prefix + "/add";
}
/**
- * 新增任务保存
+ * 新增保存
*/
@PostMapping("/add")
@ResponseBody
--
Gitblit v1.9.2