From 25648562a9c396f9013a26b4a892155ee77becbb Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期五, 14 二月 2025 11:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo
---
zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java
index 6dce4a7..7d1db3e 100644
--- a/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java
@@ -398,7 +398,7 @@
// }
//淇敼杩囨护缁熻鐐逛綅
nodeIndexInforList = nodeIndexInforList.stream().filter(x -> "STATISTIC".equals(x.getIndexType())).collect(Collectors.toList());
- final List<String> eneryIdList = nodeIndexInforList.stream().filter(x -> "STATISTIC".equals(x.getIndexType())).map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
+ final List<String> eneryIdList = nodeIndexInforList.stream().map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
final LambdaQueryWrapper<SysEnergy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CollectionUtils.isNotEmpty(eneryIdList), SysEnergy::getEnersno, eneryIdList);
final List<SysEnergy> sysEnergies = sysEnergyMapper.selectList(queryWrapper);
@@ -720,7 +720,7 @@
// return consumptionAnalysisVO;
// }
nodeIndexInforList = nodeIndexInforList.stream().filter(x -> "STATISTIC".equals(x.getIndexType())).collect(Collectors.toList());
- final List<String> eneryIdList = nodeIndexInforList.stream().filter(x -> "STATISTIC".equals(x.getIndexType())).map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
+ final List<String> eneryIdList = nodeIndexInforList.stream().map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
final LambdaQueryWrapper<SysEnergy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CollectionUtils.isNotEmpty(eneryIdList), SysEnergy::getEnersno, eneryIdList);
final List<SysEnergy> sysEnergies = sysEnergyMapper.selectList(queryWrapper);
--
Gitblit v1.9.3