Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 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);
}