关于能耗的统计调整2.0

zss

10 小时以前 bb6aeccaad6a7bdf842828d6fb11f3fb61be76eb

关于能耗的统计调整2.0

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

@@ -27,5 +27,5 @@
    private List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion;

    @ApiModelProperty("能耗类型明细")
    private List<EnergyConsumptionDetailDto> energyConsumptionDetailDtoList;
    private List<EnergyDetailDto> energyConsumptionDetailDtoList;
}

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

@@ -16,9 +16,7 @@
public class EnergyCostDto {

    @ApiModelProperty("日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate meterReadingDate;
    private String meterReadingDate;

    @ApiModelProperty("用水量")
    private BigDecimal waterConsumption;

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
package com.ruoyi.energy.dto;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;

//能耗明细
@Data
public class EnergyDetailDto {

    @ApiModelProperty("能源类型")
    private String energyTyep;

    @ApiModelProperty("能源名称")
    private String energyName;

    @ApiModelProperty("单位")
    private String unit;

    //创建人
    private String createUserName;

    //费用
    private BigDecimal cost;

    //单价
    private BigDecimal unitPrice;

    @ApiModelProperty("办公/生产")
    private String type;

    @ApiModelProperty("抄表位置")
    private String meterReadingLocation;

    @ApiModelProperty("日期")
    private String meterReadingDate;

    @ApiModelProperty("用量")
    private BigDecimal dosage;

    @ApiModelProperty("备注")
    private String remark;

}

 src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailMapper.java

@@ -5,6 +5,7 @@
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
import com.ruoyi.energy.dto.EnergyConsumptionTypeDto;
import com.ruoyi.energy.dto.EnergyCostDto;
import com.ruoyi.energy.dto.EnergyDetailDto;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.energy.vo.EnergyStatisticsVo;
@@ -40,9 +41,9 @@
    List<EnergyCostDto> energyCostDtos3(@Param("c") EnergyStatisticsVo energyStatisticsVo);

    //日能耗类型明细
    List<EnergyConsumptionDetailDto> energyConsumptionDetailDtos1(@Param("c") EnergyStatisticsVo energyStatisticsVo);
    List<EnergyDetailDto> energyConsumptionDetailDtos1(@Param("c") EnergyStatisticsVo energyStatisticsVo);
    //月能耗类型明细
    List<EnergyConsumptionDetailDto> energyConsumptionDetailDtos2(@Param("c") EnergyStatisticsVo energyStatisticsVo);
    List<EnergyDetailDto> energyConsumptionDetailDtos2(@Param("c") EnergyStatisticsVo energyStatisticsVo);
    //年能耗类型明细
    List<EnergyConsumptionDetailDto> energyConsumptionDetailDtos3(@Param("c") EnergyStatisticsVo energyStatisticsVo);
    List<EnergyDetailDto> energyConsumptionDetailDtos3(@Param("c") EnergyStatisticsVo energyStatisticsVo);
}

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


 src/main/java/com/ruoyi/productionPlan/controller/SalesDeliveryController.java

@@ -1,6 +1,13 @@
package com.ruoyi.productionPlan.controller;

import com.ruoyi.energy.vo.EnergyStatisticsVo;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.productionPlan.pojo.SalesDelivery;
import com.ruoyi.productionPlan.service.SalesDeliveryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -16,5 +23,4 @@
@RequestMapping("/salesDelivery")
@Api(tags = "销售发货明细")
public class SalesDeliveryController {

}

 src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml

@@ -67,7 +67,8 @@
            group by e.energy_tyep
    </select>
    <select id="energyCostDtos1" resultType="com.ruoyi.energy.dto.EnergyCostDto">
    select  z.meter_reading_date,
    select distinct
           z.meter_reading_date,
           COALESCE(A.waterConsumption, 0) waterConsumption,
           COALESCE(A.waterCost, 0) waterCost,
           COALESCE(B.electricityConsumption, 0) electricityConsumption,
@@ -119,7 +120,8 @@
    order by z.meter_reading_date
    </select>
    <select id="energyCostDtos2" resultType="com.ruoyi.energy.dto.EnergyCostDto">
    select DATE_FORMAT(z.meter_reading_date, '%Y-%m') AS meterReadingDate ,
    select distinct
           DATE_FORMAT(z.meter_reading_date, '%Y-%m') AS meterReadingDate ,
           COALESCE(A.waterConsumption, 0) waterConsumption,
           COALESCE(A.waterCost, 0) waterCost,
           COALESCE(B.electricityConsumption, 0) electricityConsumption,
@@ -171,7 +173,8 @@
    order by DATE_FORMAT(z.meter_reading_date, '%Y-%m')
    </select>
    <select id="energyCostDtos3" resultType="com.ruoyi.energy.dto.EnergyCostDto">
    select  DATE_FORMAT(z.meter_reading_date, '%Y') AS  meterReadingDate,
    select distinct
           DATE_FORMAT(z.meter_reading_date, '%Y') AS  meterReadingDate,
           COALESCE(A.waterConsumption, 0) waterConsumption,
           COALESCE(A.waterCost, 0) waterCost,
           COALESCE(B.electricityConsumption, 0) electricityConsumption,
@@ -222,8 +225,9 @@
        on DATE_FORMAT(z.meter_reading_date, '%Y')=C.meterReadingDate
    order by DATE_FORMAT(z.meter_reading_date, '%Y')
    </select>
    <select id="energyConsumptionDetailDtos1" resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
        select ecd.meter_reading_date,
    <select id="energyConsumptionDetailDtos1" resultType="com.ruoyi.energy.dto.EnergyDetailDto">
        select distinct
               ecd.meter_reading_date,
               e.energy_tyep,
               ecd.type,
               e.unit,
@@ -240,8 +244,9 @@
                     e.unit_price
        order by ecd.meter_reading_date
    </select>
    <select id="energyConsumptionDetailDtos2" resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
        select DATE_FORMAT(ecd.meter_reading_date, '%Y-%m') AS meterReadingDate ,
    <select id="energyConsumptionDetailDtos2" resultType="com.ruoyi.energy.dto.EnergyDetailDto">
        select distinct
               DATE_FORMAT(ecd.meter_reading_date, '%Y-%m') AS meterReadingDate ,
               e.energy_tyep,
               ecd.type,
               e.unit,
@@ -258,8 +263,9 @@
                 e.unit_price
        order by DATE_FORMAT(ecd.meter_reading_date, '%Y-%m')
    </select>
    <select id="energyConsumptionDetailDtos3" resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
        select DATE_FORMAT(ecd.meter_reading_date, '%Y') AS meterReadingDate,
    <select id="energyConsumptionDetailDtos3" resultType="com.ruoyi.energy.dto.EnergyDetailDto">
        select distinct
               DATE_FORMAT(ecd.meter_reading_date, '%Y') AS meterReadingDate,
               e.energy_tyep,
               ecd.type,
               e.unit,