From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index d7db119..10d0701 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -3,11 +3,9 @@
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;
-import com.ruoyi.energy.service.EnergyService;
+import com.ruoyi.energy.vo.EnergyStatisticsVo;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
@@ -56,11 +54,13 @@
@Log(title = "鑳借�楁妱琛ㄦ槑缁�-瀵煎叆", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
+ @ApiOperation("鑳借�楁妱琛ㄦ槑缁�-瀵煎叆")
public R importData(MultipartFile file) throws Exception {
return energyConsumptionDetailService.importData(file);
}
@PostMapping("/downloadTemplate")
+ @ApiOperation("鑳借�楁妱琛�-涓嬭浇妯℃澘")
@Log(title = "鑳借�楁妱琛�-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
public void downloadTemplate(HttpServletResponse response) {
ExcelUtil<EnergyConsumptionDetailDto> util = new ExcelUtil<EnergyConsumptionDetailDto>(EnergyConsumptionDetailDto.class);
@@ -78,8 +78,8 @@
@GetMapping("/statistics")
@ApiOperation("鎸夋棩鏈堝勾姹囨�荤粺璁�")
- public R statistics(EnergyStatisticsDto energyStatisticsDto) {
- return R.ok(energyConsumptionDetailService.statistics(energyStatisticsDto));
+ public R statistics(EnergyStatisticsVo energyStatisticsVo) {
+ return R.ok(energyConsumptionDetailService.statistics(energyStatisticsVo));
}
}
--
Gitblit v1.9.3