From 9bab1d44244289fad5f706103ac3cd33afcb0640 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 01 十一月 2022 09:17:00 +0800
Subject: [PATCH] 事件,措施，隐患
---
src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java b/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
index beabaf9..de1689e 100644
--- a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
+++ b/src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
@@ -9,10 +9,12 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureListQueryRespDTO;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.enumerate.TrEvaluationMethodDetailsEnum;
import com.ruoyi.project.enumerate.TrEvaluationMethodTypeEnum;
import com.ruoyi.project.system.dept.domain.Dept;
@@ -164,8 +166,10 @@
* 新增基础清单检查点
*/
@GetMapping("/add/{riskId}")
- public String add(@PathVariable("riskId")Long riskId ,ModelMap modelMap)
+ public String add(@PathVariable("riskId")Long riskId ,ModelMap modelMap, ModelMap mmap)
{
+ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = riskService.listRiskControlMeasure();
+ mmap.put("measureList",resultVO.getData());
modelMap.put("riksId",riskId);
return prefix + "/add";
}
@@ -209,6 +213,8 @@
@GetMapping("/edit/{checkPointId}")
public String edit(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap)
{
+ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = riskService.listRiskControlMeasure();
+ mmap.put("measureList",resultVO.getData());
BaseCheckPoint baseCheckPoint = baseCheckPointService.selectBaseCheckPointById(checkPointId);
//todo-2022 ，此处改造，嵌入管控措施
--
Gitblit v1.9.2