From a72ac436263a8f41dd85635153dfdf204ae6eaa0 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 31 十月 2022 14:18:01 +0800
Subject: [PATCH] 检查点查询添加管控措施ID
---
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java | 1 +
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 9 ++++++++-
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java | 3 ---
src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java | 12 +++++++++++-
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java | 1 +
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 5 +++++
6 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
index c1e07c1..7a465aa 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -1,5 +1,6 @@
package com.ruoyi.doublePrevention.service;
+import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
@@ -167,4 +168,8 @@
* 管控措施-不分页查询
*/
ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();
+ /**
+ * 通过排查点，查找管控措施id
+ */
+ PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
index 0c8e7ce..5f16c72 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
@@ -27,4 +27,5 @@
* 通过baseCheckPointId 查询管控措施列表
*/
PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);
+
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
index d954c4f..15213d4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
@@ -42,4 +42,5 @@
public PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId) {
return preventRiskCheckUnitRepository.getUnitByBaseCheckPointId(baseCheckPointId);
}
+
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
index 2a4f2dd..c0a3bf9 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
@@ -1,11 +1,8 @@
package com.ruoyi.doublePrevention.service.baseService.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.enums.ResultCodes;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventRiskControlMeasureRepository;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index 469236c..d3d4458 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1298,8 +1298,15 @@
ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
return resultVO;
}
+ /**
+ * 通过排查点，查找管控措施id
+ */
+ @Override
+ public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {
+ return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
+ }
-// /**
+ // /**
// * 全流程隐患上报-附属表信息插入
// * */
// @Override
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..3ac9fcb 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.doublePrevention.service.baseService.PreventRiskDangerInfoService;
@@ -81,7 +82,16 @@
{
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());
+ resultList.add(checkPoint);
+ }
+
+ return getDataTable(resultList);
}
/**
--
Gitblit v1.9.2