From 1bdce029a16f396a933848b368040e78740728fa Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: 星期五, 16 九月 2022 09:39:03 +0800
Subject: [PATCH] 新增原巡检点与措施的删除、修改、查询功能

---
 src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 add8689..2ed839c 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
@@ -8,6 +8,7 @@
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
 import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
 import com.ruoyi.doublePrevention.service.RiskService;
 import com.ruoyi.project.enumerate.TrEvaluationMethodDetailsEnum;
@@ -180,6 +181,12 @@
     public String edit(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap)
     {
         BaseCheckPoint baseCheckPoint = baseCheckPointService.selectBaseCheckPointById(checkPointId);
+        //todo-2022 返回参数加入措施id
+        PreventRiskCheckUnit riskCheckUnit = riskService.getRiskUnitByBaseCheckPointId(checkPointId);
+
+        if (riskCheckUnit != null){
+            baseCheckPoint.setControlMeasureId(riskCheckUnit.getControlMeasureId());
+        }
         mmap.put("baseCheckPoint", baseCheckPoint);
         return prefix + "/edit";
     }

--
Gitblit v1.9.2