From 475734b8d720a928bdaa8243441d59e314ade959 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 25 八月 2023 10:40:32 +0800
Subject: [PATCH] 时间问题修改
---
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
index 52f7962..5f4d28c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -1,19 +1,13 @@
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.*;
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.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
import java.util.List;
@@ -104,7 +98,7 @@
/**
* 保存job管控措施的附属表
*/
- int insertJobAndMeasure(Long jobId);
+ int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);
/**
* 修改job管控措施的附属表
*/
@@ -126,7 +120,7 @@
* 定时生成排查任务记录时，
* 插入检查点附属表
*/
- void insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
+ int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
/**
* 删除定时核查任务
* */
@@ -146,7 +140,43 @@
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);
+
+ int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp);
}
--
Gitblit v1.9.2