From 11f902d3bd73af3902cda568972a503091ab8752 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:06:32 +0800
Subject: [PATCH] 能耗成本核算---按日月汇总统计调整
---
/dev/null | 19 -------------------
src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailMapper.java | 3 ---
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | 3 ---
src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java | 3 ---
src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml | 10 ++--------
5 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
index e2a747e..8a5bf97 100644
--- a/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
@@ -23,9 +23,6 @@
@ApiModelProperty("骞冲潎鎴愭湰")
private BigDecimal averageEnergyCost;
- @ApiModelProperty("鑳借�楁垚鏈秼鍔�")
- private List<EnergyAccountTypeDto> energyAccountTypeDtos;
-
@ApiModelProperty("鑳借�楃被鍨嬫垚鏈崰姣�")
private List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion;
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyAccountTypeDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyAccountTypeDto.java
deleted file mode 100644
index d8105fb..0000000
--- a/src/main/java/com/ruoyi/energy/dto/EnergyAccountTypeDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.energy.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@ApiModel("鑳借�楁垚鏈秼鍔�")
-public class EnergyAccountTypeDto {
-
- //"鍔炲叕/鐢熶骇"
- @ApiModelProperty("鑳借�楀満鏅�")
- private String energyAccountType;
-
- @ApiModelProperty("鑳借�楁垚鏈�")
- private BigDecimal energyAccount;
-}
diff --git a/src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailMapper.java b/src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailMapper.java
index d29bfa5..f982bd1 100644
--- a/src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailMapper.java
+++ b/src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailMapper.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.energy.dto.EnergyAccountTypeDto;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
import com.ruoyi.energy.dto.EnergyConsumptionTypeDto;
import com.ruoyi.energy.dto.EnergyCostDto;
@@ -34,8 +33,6 @@
List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion(@Param("c") EnergyStatisticsVo energyStatisticsVo);
List<EnergyCostDto> energyCostDtos(@Param("c") EnergyStatisticsVo energyStatisticsVo);
-
- List<EnergyAccountTypeDto> energyAccountTypeDtos(@Param("c") EnergyStatisticsVo energyStatisticsVo);
List<EnergyConsumptionDetailDto> energyConsumptionDetailDtos(@Param("c") EnergyStatisticsVo energyStatisticsVo);
}
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 60bbcd3..4dabac8 100644
--- a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
@@ -143,9 +143,6 @@
energyStatisticsVo.setType(null);//鎭㈠鏌ヨ鍏ㄩ儴
//骞冲潎鎴愭湰
energyAccountDto.setAverageEnergyCost(energyAccountDto.getTotalEnergyCost().divide(new BigDecimal(energyStatisticsVo.getDays()),2, RoundingMode.HALF_UP));
- //鑳借�楁垚鏈秼鍔�
- List<EnergyAccountTypeDto> energyAccountTypeDtos=energyConsumptionDetailMapper.energyAccountTypeDtos(energyStatisticsVo);
- energyAccountDto.setEnergyAccountTypeDtos(energyAccountTypeDtos);
//鑳借�楃被鍨嬫垚鏈崰姣�
List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
energyAccountDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
diff --git a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
index 227474c..cbbbd18 100644
--- a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
+++ b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
@@ -118,19 +118,12 @@
on z.meter_reading_date=C.meter_reading_date
order by z.meter_reading_date
</select>
- <select id="energyAccountTypeDtos" resultType="com.ruoyi.energy.dto.EnergyAccountTypeDto">
- select ecd.type energyAccountType,
- SUM(COALESCE(ecd.dosage, 0) * e.unit_price) energyAccount
- from energy_consumption_detail ecd
- left join energy e on ecd.energy_id = e.id
- where ecd.meter_reading_date between #{c.startDate} and #{c.endDate}
- group by ecd.type
- </select>
<select id="energyConsumptionDetailDtos"
resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
select ecd.meter_reading_date,
e.energy_tyep,
ecd.type,
+ e.unit,
e.unit_price,
sum(ecd.dosage) dosage,
sum(ecd.dosage * e.unit_price) cost
@@ -140,6 +133,7 @@
group by ecd.meter_reading_date,
e.energy_tyep,
ecd.type,
+ e.unit,
e.unit_price
order by ecd.meter_reading_date
</select>
--
Gitblit v1.9.3