From 7f1daf583d98492a41d9e8e779c50e839b9d2563 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 01 四月 2026 11:05:35 +0800
Subject: [PATCH] fix: 规格型号导入模版中加上物料编码字段
---
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index b6bd886..1316d94 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -77,16 +77,22 @@
/*******************************************姹囨�荤粺璁�*****************************************************************************************************************************************************************************/
@GetMapping("/statistics")
- @ApiOperation("鑳借�楃粺璁�---鎸夋棩鏈堝勾姹囨�荤粺璁�")
+ @ApiOperation("鑳借�楃鐞�---鑳借�楃粺璁�")
public R statistics(EnergyStatisticsVo energyStatisticsVo) {
return R.ok(energyConsumptionDetailService.statistics(energyStatisticsVo));
}
@GetMapping("/account")
- @ApiOperation("鑳借�楁垚鏈牳绠�---鎸夋棩鏈堟眹鎬荤粺璁�")
+ @ApiOperation("鎴愭湰鏍哥畻---鑳借�楁垚鏈牳绠�")
public R account(EnergyStatisticsVo energyStatisticsVo) {
energyStatisticsVo.setType(null);
return R.ok(energyConsumptionDetailService.account(energyStatisticsVo));
}
+ @GetMapping("/collectEnergy")
+ @ApiOperation("鍐崇瓥鍒嗘瀽---鑳借�楀崟鑰�")
+ public R collectEnergy(EnergyStatisticsVo energyStatisticsVo) {
+ return R.ok(energyConsumptionDetailService.collectEnergy(energyStatisticsVo));
+ }
+
}
--
Gitblit v1.9.3