From faee962a89c0b2379be11e66b6ada1e0379c9144 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 19 三月 2024 15:46:00 +0800
Subject: [PATCH] 新增检索条件
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerBaseController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerBaseController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerBaseController.java
index 9c55bdd..69e1640 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerBaseController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerBaseController.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
@@ -39,7 +41,8 @@
@Autowired
private IHiddenDangerCheckPointService hiddenDangerCheckPointService;
-
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;
/**
* 查询风险单元的检查点列表
@@ -126,15 +129,21 @@
/**
- * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行
+ * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行 todo
*/
@PostMapping("/selectBaseCheckPointListByCheckIdAndMergeSamePoint")
@ResponseBody
public TableDataInfo selectBaseCheckPointListByCheckIdAndMergeSamePoint(BaseCheckPointDTO baseCheckPointDTO) {
List<BaseCheckPointDTO> list = hiddenDangerCheckPointService.selectBaseCheckPointListByCheckId(baseCheckPointDTO);
+ List<PreventRiskDangerCheckAndMeasure> riskDangerCheckAndMeasures = riskDangerCheckAndMeasureService.getByCheckId(baseCheckPointDTO.getCheckId());
List<BaseCheckPointDTO> listLast = new ArrayList<>();
Set<Long> checkPointIds = new HashSet<Long>();
for (int i = 0; i < list.size(); i++) {
+ for (PreventRiskDangerCheckAndMeasure riskDangerCheckAndMeasure : riskDangerCheckAndMeasures) {
+ if (riskDangerCheckAndMeasure.getDangerCheckPointId().equals(list.get(i).getId())){
+ list.get(i).setCheckDesc(riskDangerCheckAndMeasure.getCheckDesc());
+ }
+ }
if ("0".equals(list.get(i).getWhetherDanger())) {
listLast.add(list.get(i));
checkPointIds.add(list.get(i).getCheckPointId());
--
Gitblit v1.9.2