From ea6d7a1c57974f9c6209e5b8ad291985c315e9c1 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Thu, 13 Oct 2022 10:07:47 +0800
Subject: [PATCH] 调度存在BUG，但是已经跑通
---
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 60d35d7..7d9aa9d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -974,8 +974,8 @@
* 插入检查点附属表
*/
@Override
- public void insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
-
+ public int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
+ System.out.println("进入核查点保存方法");
PreventRiskDangerCheckAndMeasure checkAndMeasure = new PreventRiskDangerCheckAndMeasure();
//根据检查点信息，查询对应管控措施
@@ -983,23 +983,26 @@
if (checkUnit == null){
throw new RuntimeException("基础检查点不存在");
}
-
+ System.out.println("通过一次检验");
PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
if (controlMeasure == null){
throw new RuntimeException("管控措施已经被删除");
}
-
+ System.out.println("通过二次检验");
//封装数据
checkAndMeasure.setCheckId(hdcp.getCheckId());
checkAndMeasure.setDangerCheckPointId(id);
checkAndMeasure.setBaseCheckPointId(hdcp.getCheckPointId());
checkAndMeasure.setControlMeasureId(controlMeasure.getId());
checkAndMeasure.setCheckContent(controlMeasure.getCheckContent());
- checkAndMeasure.setCheckResult(null);
-
+ checkAndMeasure.setCheckResult((byte) 4);
+ System.out.println("数据封装完成");
//写入核查任务检查点与管控措施信息
- preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
-
+ int result = preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
+ if (result <1){
+ return StatusEnum.EXEC_FAIL.getCode();
+ }
+ return StatusEnum.EXEC_SUCCESS.getCode();
}
/**
* todo-2022 填报时的操作
--
Gitblit v1.9.2