From 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 17 七月 2024 16:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
index 2e8a1af..c2d4230 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
@@ -32,6 +32,11 @@
public PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId) {
return preventRiskJobAndMeasureRepository.getJobAndMeasureByJobId(jobId);
}
+
+ @Override
+ public List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getJobAndMeasureListByJobId(jobId);
+ }
/**
* 删除job管控措施的附属表关联信息
*/
@@ -68,5 +73,15 @@
return result;
}
+ @Override
+ public List<PreventRiskJobAndMeasure> listReportWorkTest() {
+ return preventRiskJobAndMeasureRepository.listReportWorkTest();
+ }
+
+ @Override
+ public List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getRectifyJobData(jobId);
+ }
+
}
--
Gitblit v1.9.2