From 171c413e6a3d1e4c24fae4fa54fcb7982a1a822d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 28 三月 2026 15:35:31 +0800
Subject: [PATCH] 销售看板统计的汇总
---
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 58dc509..50e280a 100644
--- a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
@@ -24,6 +24,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -123,7 +124,19 @@
List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
energyStatisticsDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
//鑳借�楁槑缁�
- List<EnergyCostDto> energyCostDtos=energyConsumptionDetailMapper.energyCostDtos(energyStatisticsVo);
+ List<EnergyCostDto> energyCostDtos=new ArrayList<>();
+ //鍒ゆ柇鏃�/鏈�/骞�
+ switch (energyStatisticsVo.getState()){
+ case "鏃�":
+ energyCostDtos=energyConsumptionDetailMapper.energyCostDtos1(energyStatisticsVo);
+ break;
+ case "鏈�":
+ energyCostDtos=energyConsumptionDetailMapper.energyCostDtos2(energyStatisticsVo);
+ break;
+ case "骞�":
+ energyCostDtos=energyConsumptionDetailMapper.energyCostDtos3(energyStatisticsVo);
+ break;
+ }
energyStatisticsDto.setEnergyCostDtos(energyCostDtos);
return energyStatisticsDto;
}
@@ -147,8 +160,20 @@
List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
energyAccountDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
//鑳借�楃被鍨嬫槑缁�
- List<EnergyConsumptionDetailDto> energyConsumptionDetailDtoList=energyConsumptionDetailMapper.energyConsumptionDetailDtos(energyStatisticsVo);
- energyAccountDto.setEnergyConsumptionDetailDtoList(energyConsumptionDetailDtoList);
+ List<EnergyDetailDto> energyDetailDtos = new ArrayList<>();
+ //鍒ゆ柇鏃�/鏈�/骞�
+ switch (energyStatisticsVo.getState()){
+ case "鏃�":
+ energyDetailDtos=energyConsumptionDetailMapper.energyConsumptionDetailDtos1(energyStatisticsVo);
+ break;
+ case "鏈�":
+ energyDetailDtos=energyConsumptionDetailMapper.energyConsumptionDetailDtos2(energyStatisticsVo);
+ break;
+ case "骞�":
+ energyDetailDtos=energyConsumptionDetailMapper.energyConsumptionDetailDtos3(energyStatisticsVo);
+ break;
+ }
+ energyAccountDto.setEnergyConsumptionDetailDtoList(energyDetailDtos);
return energyAccountDto;
}
@@ -158,7 +183,21 @@
//鑳借�楀崟鑰楁暟鎹�
List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
energyCollectDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
- //鑳借�楀崟鑰楄秼鍔�(寰呭疄鐜�)
+ //鑳借�楀崟鑰楄秼鍔�
+ List<EnergyCostDto> energyCostDtos=new ArrayList<>();
+ //鍒ゆ柇鏃�/鏈�/骞�
+ switch (energyStatisticsVo.getState()){
+ case "鏃�":
+ energyCostDtos=energyConsumptionDetailMapper.energyCostDtos1(energyStatisticsVo);
+ break;
+ case "鏈�":
+ energyCostDtos=energyConsumptionDetailMapper.energyCostDtos2(energyStatisticsVo);
+ break;
+ case "骞�":
+ energyCostDtos=energyConsumptionDetailMapper.energyCostDtos3(energyStatisticsVo);
+ break;
+ }
+ energyCollectDto.setEnergyCostDtos(energyCostDtos);
return energyCollectDto;
}
}
--
Gitblit v1.9.3