能耗成本核算---按日月汇总统计调整

zss

10 小时以前 11f902d3bd73af3902cda568972a503091ab8752

能耗成本核算---按日月汇总统计调整

 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;


 src/main/java/com/ruoyi/energy/dto/EnergyAccountTypeDto.java

ÎļþÒÑɾ³ý

 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);
}

 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);

 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>