From 886a387463f4e0e0ad6f7c2a04d2cfab2e3aace8 Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: Fri, 28 Oct 2022 10:48:05 +0800
Subject: [PATCH] 新增管控措施不分页
---
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 90 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 05f96f4..c1e07c1 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -1,14 +1,15 @@
package com.ruoyi.doublePrevention.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
+import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
import com.ruoyi.doublePrevention.entity.dto.req.*;
import com.ruoyi.doublePrevention.entity.dto.resp.*;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import java.util.List;
@@ -17,7 +18,14 @@
* 为设施设备清单附属表添加uuid
* */
int insertRiskUnitUuid(Long id);
-
+ /**
+ * 修改风险清单附属表
+ */
+ int updateRiskUnit(Long riskListId);
+ /**
+ * 删除附属表信息
+ */
+ int deleteRiskUnit(String ids);
/**
* 风险事件-新增
*/
@@ -77,9 +85,86 @@
* 管控措施-分页查询
*/
ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);
-
+ /**
+ * 查询管控措施 by 基础排查清单ID
+ */
+ List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId);
/**
* 保存原检查点与管控措施的对应关系
*/
int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams);
+ /**
+ * 删除原检查点与管控措施的对应关系
+ */
+ int deletePointAndMeasure(String ids);
+ /**
+ * 保存job管控措施的附属表
+ */
+ int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);
+ /**
+ * 修改job管控措施的附属表
+ */
+ int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob);
+ /**
+ * 删除job管控措施的附属表
+ */
+ int deleteJobAndMeasure(String ids);
+ /**
+ * 查询Job与措施
+ */
+ PreventRiskJobAndMeasure getJobAndMeasure(Long jobId);
+ /**
+ * 定时生成排查任务记录时，
+ * 插入排查记录附属表
+ */
+ int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc);
+ /**
+ * 定时生成排查任务记录时，
+ * 插入检查点附属表
+ */
+ int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
+ /**
+ * 删除定时核查任务
+ * */
+ int deleteDangerCheck(String ids);
+
+ /**
+ * 新增隐患上报
+ * */
+ int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
+ /**
+ * 修改隐患上报
+ * */
+ int updateDangerInfo(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 删除隐患上报
+ */
+ 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();
}
--
Gitblit v1.9.2