From 4ec71930da15cc83b2fbf67fdeade89b8900b14c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 31 三月 2026 17:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
index ae6b522..50e280a 100644
--- a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
@@ -160,20 +160,20 @@
List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
energyAccountDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
//鑳借�楃被鍨嬫槑缁�
- List<EnergyConsumptionDetailDto> energyConsumptionDetailDtoList = new ArrayList<>();
+ List<EnergyDetailDto> energyDetailDtos = new ArrayList<>();
//鍒ゆ柇鏃�/鏈�/骞�
switch (energyStatisticsVo.getState()){
case "鏃�":
- energyConsumptionDetailDtoList=energyConsumptionDetailMapper.energyConsumptionDetailDtos1(energyStatisticsVo);
+ energyDetailDtos=energyConsumptionDetailMapper.energyConsumptionDetailDtos1(energyStatisticsVo);
break;
case "鏈�":
- energyConsumptionDetailDtoList=energyConsumptionDetailMapper.energyConsumptionDetailDtos2(energyStatisticsVo);
+ energyDetailDtos=energyConsumptionDetailMapper.energyConsumptionDetailDtos2(energyStatisticsVo);
break;
case "骞�":
- energyConsumptionDetailDtoList=energyConsumptionDetailMapper.energyConsumptionDetailDtos3(energyStatisticsVo);
+ energyDetailDtos=energyConsumptionDetailMapper.energyConsumptionDetailDtos3(energyStatisticsVo);
break;
}
- energyAccountDto.setEnergyConsumptionDetailDtoList(energyConsumptionDetailDtoList);
+ energyAccountDto.setEnergyConsumptionDetailDtoList(energyDetailDtos);
return energyAccountDto;
}
--
Gitblit v1.9.3