From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
index ccc0ebd..79fac8f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
@@ -19,7 +19,7 @@
 
 	List<DamStationStatistics> tableResCountPage(@Param("dam")DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page);
 
-	List<DamStationStatistics> alarmResCount(@Param("dam") DamStationStatistics damStationStatistics);
+	List<DamStationStatistics> alarmResCount(@Param("dam") DamStationStatistics damStationStatistics,@Param("basCodes") String basCodes);
 
     List<DamStatisticsRes> damResInfoCount(@Param("adCode") String adCode);
 
@@ -30,4 +30,8 @@
 	List<DamStationStatistics> getResSyNormalList(@Param("adCode") String adCode);
 
 	List<DamStationStatistics> getResSlNormalList(@Param("adCode") String adCode);
+
+	List<DamStationStatistics> getSyList(@Param("adCode") String adCode, @Param("status") String status);
+	List<DamStationStatistics> getSlList(@Param("adCode") String adCode, @Param("status") String status);
+	List<DamStationStatistics> getWyList(@Param("adCode") String adCode, @Param("status") String status);
 }

--
Gitblit v1.9.3