From 1799f4a7988d52feb6230b6b140ef6ce1543b0f4 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 11 Sep 2023 14:19:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
index e160f13..baa7454 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
@@ -444,20 +444,20 @@
List<RiskList> riskLists = riskListService.selectRiskListList(riskList);
List<PreventRiskCheckUnitRespDTO> list = new ArrayList<>();
- //todo-2022 新代码，使用DTO,封装进去措施数据
- for (RiskList risk : riskLists) {
- PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
+ //todo-2022 新代码，使用DTO,封装进去措施数据 --暂时不使用
+// for (RiskList risk : riskLists) {
+// PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
+//
+// //查询封装管控措施
+// List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
+// if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
+// respDTO.setRiskControlMeasures(riskControlMeasureList);
+// }
+//
+// list.add(respDTO);
+// }
- //查询封装管控措施
- List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
- if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
- respDTO.setRiskControlMeasures(riskControlMeasureList);
- }
-
- list.add(respDTO);
- }
-
- return getDataTable(list);
+ return getDataTable(riskLists);
}
--
Gitblit v1.9.2