Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

4 天以前 cf7bc2d68e7d86e7d4b896acf1400f534d594daa

 src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
import com.ruoyi.energy.dto.EnergyStatisticsDto;
import com.ruoyi.energy.pojo.Energy;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.ruoyi.energy.service.EnergyConsumptionDetailService;
@@ -73,4 +74,12 @@
        energyConsumptionDetailService.export(response);
    }

    /*******************************************汇总统计*****************************************************************************************************************************************************************************/

    @GetMapping("/statistics")
    @ApiOperation("按日月年汇总统计")
    public R statistics(EnergyStatisticsDto energyStatisticsDto) {
        return R.ok(energyConsumptionDetailService.statistics(energyStatisticsDto));
    }

}