From 8aa4448ea65b5ef86689bd15c6b895afc99d17d0 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 12 Jul 2023 16:18:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java
index adf9e5a..5c38ed5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java
@@ -43,7 +43,7 @@
private final IUserClient userClient;
@Override
- public IPage<ReportFloodRecord> selectReportFloodRecordPages(IPage<ReportFloodRecord> page, ReportFloodRecord reportFloodRecord) {
+ public IPage<ReportFloodRecordVO> selectReportFloodRecordPages(IPage<ReportFloodRecordVO> page, ReportFloodRecordVO reportFloodRecord) {
return page.setRecords(baseMapper.selectReportFloodRecordPages(page,reportFloodRecord));
}
@@ -52,6 +52,16 @@
return baseMapper.customizeGetDetail(reportFloodRecordVO);
}
+ @Override
+ public ReportFloodRecord getLatestRecord(String reservoirId) {
+ return baseMapper.getLatestRecord(reservoirId);
+ }
+
+ @Override
+ public ReportFloodRecordVO getDetailVO(String id) {
+ return baseMapper.getDetailVO(id);
+ }
+
/**
* 根据水库id和责任人类型获取用户
* @param type 责任人类型
--
Gitblit v1.9.3