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

xieb

2024-01-24 e143a763c75da7cc020bf19259256c8155b5da96

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java

@@ -30,8 +30,14 @@
   }

   @Override
   public DamSecurityStatistics getSingleRegionCountOptimize(DamSecurityStatistics damSecurityStatistics) {
      return damSecurityMapper.getSingleRegionCountOptimize(damSecurityStatistics);
   }

   @Override
   public List<DamSecurityStatistics> listRegionCount(DamSecurityStatistics damSecurityStatistics) {
      return damSecurityMapper.listRegionCount(damSecurityStatistics);
//      return damSecurityMapper.listRegionCount(damSecurityStatistics);
      return damSecurityMapper.listRegionCountOptimize(damSecurityStatistics);
   }

   @Override
@@ -41,7 +47,8 @@

   @Override
   public IPage<DamStationStatistics> tableResCountPage(DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page) {
      return page.setRecords(damSecurityMapper.tableResCountPage(damStationStatistics,page));
//      return page.setRecords(damSecurityMapper.tableResCountPage(damStationStatistics,page));
      return page.setRecords(damSecurityMapper.tableResCountPageOptimize(damStationStatistics,page));
   }

   @Override
@@ -178,4 +185,5 @@
      list.add(wy);
      return list;
   }

}