From 78d0dce326dc6cbe31b79862e656254abf02bc94 Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: 星期二, 25 四月 2023 12:15:17 +0800
Subject: [PATCH] 事件措施异常
---
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 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 7b2aa23..9b4b203 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -1,8 +1,6 @@
package com.ruoyi.doublePrevention.service;
-import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
-import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
-import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
+import com.ruoyi.doublePrevention.entity.*;
import com.ruoyi.doublePrevention.entity.dto.req.*;
import com.ruoyi.doublePrevention.entity.dto.resp.*;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
@@ -100,7 +98,7 @@
/**
* 保存job管控措施的附属表
*/
- int insertJobAndMeasure(Long jobId);
+ int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);
/**
* 修改job管控措施的附属表
*/
@@ -122,7 +120,7 @@
* 定时生成排查任务记录时，
* 插入检查点附属表
*/
- void insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
+ int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
/**
* 删除定时核查任务
* */
@@ -142,13 +140,41 @@
int deleteDangerInfo(Long id);
/**
+ * 隐患判定，如果是隐患，修改为整改中
+ */
+ int updateDangerInfoJudge(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
* 隐患整改信息 - 修改
*/
int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 隐患验收 - 保存验收信息
+ */
+ int updateDangerInfoAccept(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+// /**
+// * 全流程隐患上报-附属表信息插入
+// * */
+// int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
/**
* @description 获取所有的风险分析单元的编码和姓名
*/
List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName();
+ /**
+ * 管控措施-不分页查询
+ */
+ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();
+ /**
+ * 通过排查点，查找管控措施id
+ */
+ PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);
+ /**
+ * 查询管控措施信息
+ */
+ PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId);
+ /**
+ * 查询隐患附属表信息
+ */
+ PreventRiskDangerInfo getDangerInfoById(Long id);
}
--
Gitblit v1.9.2