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/impl/RiskServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
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 bbfefa2..d3d4458 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -803,7 +803,7 @@
@Override
public int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob) {
- String jobUuid = UUID.randomUUID().toString();
+
PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();
//根据RiskId查询对应的管控措施
@@ -811,6 +811,7 @@
//遍历管控措施集合
for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
+ String jobUuid = UUID.randomUUID().toString();
PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
//封装数据
jobAndMeasure.setJobId(jobId);
@@ -944,7 +945,7 @@
PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();
dangerCheck.setUuid(dangerCheckUuid);
- dangerCheck.setCheckStatus(null);
+ dangerCheck.setCheckStatus(null);//
dangerCheck.setCheckId(checkId);
dangerCheck.setJobId(hdc.getJobId());
//获取上报主配置信息
@@ -1024,6 +1025,7 @@
return StatusEnum.EXEC_FAIL.getCode();
}
}
+
//2、删除核查任务-检查点的附属表----老代码未删除检查点信息，此处暂不做处理
return StatusEnum.EXEC_SUCCESS.getCode();
@@ -1296,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
--
Gitblit v1.9.2