From 9eaf260bb0368eea783b0ff0dd4ba7375c79e0f4 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Mon, 31 Oct 2022 15:05:48 +0800
Subject: [PATCH] 检查点查询添加管控措施信息
---
src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 4d7ba08..beabaf9 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,8 @@
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.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService;
@@ -81,7 +83,24 @@
{
startPage();
List<BaseCheckPoint> list = baseCheckPointService.selectBaseCheckPointList(baseCheckPoint);
- return getDataTable(list);
+ List<BaseCheckPoint> resultList = new ArrayList<>();
+
+ //todo-2022 ，此处改造，查询措施相关信息
+ for (BaseCheckPoint checkPoint : list) {
+ PreventRiskCheckUnit measureByCheckPointId = riskService.getRiskControlMeasureByCheckPointId(checkPoint.getCheckPointId());
+ checkPoint.setControlMeasureId(measureByCheckPointId.getControlMeasureId());
+ PreventRiskControlMeasure riskControlMeasureInfo = riskService.getRiskControlMeasureInfo(checkPoint.getCheckPointId());
+ checkPoint.setControlMeasureId(riskControlMeasureInfo.getId());
+ checkPoint.setControlMeasureCode(riskControlMeasureInfo.getControlMeasureCode());
+ checkPoint.setClassify1(Integer.valueOf(riskControlMeasureInfo.getClassify1()));
+ checkPoint.setClassify2(Integer.valueOf(riskControlMeasureInfo.getClassify2()));
+ checkPoint.setClassify3(riskControlMeasureInfo.getClassify3());
+ checkPoint.setMeasureDesc(riskControlMeasureInfo.getMeasureDesc());
+ checkPoint.setRiskCheckContent(riskControlMeasureInfo.getCheckContent());
+ resultList.add(checkPoint);
+ }
+
+ return getDataTable(resultList);
}
/**
@@ -191,6 +210,19 @@
public String edit(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap)
{
BaseCheckPoint baseCheckPoint = baseCheckPointService.selectBaseCheckPointById(checkPointId);
+
+ //todo-2022 ，此处改造，嵌入管控措施
+ PreventRiskControlMeasure riskControlMeasureInfo = riskService.getRiskControlMeasureInfo(baseCheckPoint.getCheckPointId());
+
+ baseCheckPoint.setControlMeasureId(riskControlMeasureInfo.getId());
+ baseCheckPoint.setControlMeasureCode(riskControlMeasureInfo.getControlMeasureCode());
+ baseCheckPoint.setClassify1(Integer.valueOf(riskControlMeasureInfo.getClassify1()));
+ baseCheckPoint.setClassify2(Integer.valueOf(riskControlMeasureInfo.getClassify2()));
+ baseCheckPoint.setClassify3(riskControlMeasureInfo.getClassify3());
+ baseCheckPoint.setMeasureDesc(riskControlMeasureInfo.getMeasureDesc());
+ baseCheckPoint.setRiskCheckContent(riskControlMeasureInfo.getCheckContent());
+
+
mmap.put("baseCheckPoint", baseCheckPoint);
return prefix + "/edit";
}
--
Gitblit v1.9.2