From 3fe81a2e2ef55c9eda69fef17c660fa7f4edcaf5 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 04 八月 2026 18:17:45 +0800
Subject: [PATCH] fix:当年按月充电收入

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
index 94fb484..f4d2050 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
@@ -4,7 +4,6 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.order.dto.SixChargingDto;
 import com.ruoyi.order.service.TChargingOrderService;
-import com.ruoyi.order.util.PreviousSixMonths;
 import com.ruoyi.order.vo.LargeChargingPowerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,11 +36,11 @@
         return R.ok(chargingOrderService.getLargeScreenSummary(normalizeSiteIds(siteIds)));
     }
 
-    @ApiOperation(tags = {"大屏-收入趋势"}, value = "近六个月充电收入")
+    @ApiOperation(tags = {"大屏-收入趋势"}, value = "当年按月充电收入")
     @GetMapping("/incomeTrend")
     public R<List<SixChargingDto>> incomeTrend(@RequestParam("siteIds") List<Integer> siteIds) {
         return R.ok(chargingOrderService.getLargeScreenIncomeTrend(
-                normalizeSiteIds(siteIds), PreviousSixMonths.get()));
+                normalizeSiteIds(siteIds), LocalDate.now().withDayOfYear(1)));
     }
 
     @ApiOperation(tags = {"大屏-停车场充电功率曲线图"},value = "停车场充电功率曲线图")

--
Gitblit v1.7.1