From 7572552bcebd353050f95a1965526e2fadb31f67 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 08 Aug 2023 16:56:31 +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/damSecurity/controller/DamSecurityController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
index aa6e030..20c9891 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
@@ -72,6 +72,18 @@
 	}
 
 	/**
+	 * 大坝安全监测表格导出
+	 * @param damStationStatistics
+	 * @return
+	 */
+	@ApiOperation(value = "大坝安全统计-大坝安全监测表格导出", notes = "大坝安全统计-大坝安全监测表格导出")
+	@GetMapping(value = "/tableResCountAll")
+	public R tableResCountAll(DamStationStatistics damStationStatistics) {
+		List<DamStationStatistics> list  =  damSecurityService.tableResCount(damStationStatistics);
+		return R.data(list);
+	}
+
+	/**
 	 * 大坝安全监测预警详情
 	 * @param alarmGet
 	 * @return

--
Gitblit v1.9.3