From 931beabfe37a733b6d2fb92119dab3aabe869c98 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 11:08:34 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index 22ef516..d7db119 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/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));
+ }
+
}
--
Gitblit v1.9.3