From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
index 1e08868..37d50d5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -48,8 +48,6 @@
reportFloodRecord.setAdCode(code.substring(0,4));
}
}
-
-
IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
return R.data(pageList);
}
@@ -114,5 +112,18 @@
ReportFloodRecord reportFloodRecord = reportFloodRecordService.getById(id);
return R.data(reportFloodRecord);
}
+
+ /**
+ * 根据水库id返回最新审核通过的报汛记录
+ *
+ * @param reservoirId
+ * @return
+ */
+ @ApiOperation(value = "报汛记录-根据水库id返回最新审核通过的报汛记录", notes = "报汛记录-根据水库id返回最新审核通过的报汛记录")
+ @GetMapping(value = "/getLatestRecord")
+ public R getLatestRecord(String reservoirId) {
+ ReportFloodRecord reportFloodRecord = reportFloodRecordService.getLatestRecord(reservoirId);
+ return R.data(reportFloodRecord);
+ }
}
--
Gitblit v1.9.3