From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.java
index d43b873..ab52d0b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.sale.ErpSaleCustomerSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.sale.ErpSaleProductSummaryRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.sale.ErpSaleSummaryRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.sale.ErpSaleTimeSummaryRespVO;
import cn.iocoder.yudao.module.erp.service.statistics.ErpSaleStatisticsService;
@@ -12,6 +14,7 @@
import jakarta.annotation.Resource;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -22,6 +25,7 @@
import java.util.List;
import static cn.hutool.core.date.DatePattern.NORM_MONTH_PATTERN;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "绠＄悊鍚庡彴 - ERP 閿�鍞粺璁�")
@@ -48,6 +52,32 @@
return success(summary);
}
+ @GetMapping("/customer-summary")
+ @Operation(summary = "鑾峰緱瀹㈡埛閿�鍞粺璁★紙閿�鍞銆佸凡鏀舵銆佹湭鏀舵銆佽鍗曟暟锛�")
+ @Parameter(name = "customerId", description = "瀹㈡埛缂栧彿锛屼负绌鸿〃绀哄叏閮ㄥ鎴�")
+ @Parameter(name = "beginTime", description = "涓嬪崟鏃堕棿寮�濮�", example = "2026-01-01 00:00:00")
+ @Parameter(name = "endTime", description = "涓嬪崟鏃堕棿缁撴潫", example = "2026-12-31 23:59:59")
+ public CommonResult<List<ErpSaleCustomerSummaryRespVO>> getCustomerSummary(
+ @RequestParam(value = "customerId", required = false) Long customerId,
+ @RequestParam(value = "beginTime", required = false)
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime beginTime,
+ @RequestParam(value = "endTime", required = false)
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime endTime) {
+ return success(saleStatisticsService.getCustomerSummary(customerId, beginTime, endTime));
+ }
+
+ @GetMapping("/product-summary")
+ @Operation(summary = "鑾峰緱浜у搧閿�鍞粺璁★紙閿�閲忋�侀攢鍞銆佹垚鏈�佹瘺鍒╋級")
+ @Parameter(name = "productId", description = "浜у搧缂栧彿锛屼负绌鸿〃绀哄叏閮ㄤ骇鍝�")
+ public CommonResult<List<ErpSaleProductSummaryRespVO>> getProductSummary(
+ @RequestParam(value = "productId", required = false) Long productId,
+ @RequestParam(value = "beginTime", required = false)
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime beginTime,
+ @RequestParam(value = "endTime", required = false)
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime endTime) {
+ return success(saleStatisticsService.getProductSummary(productId, beginTime, endTime));
+ }
+
@GetMapping("/time-summary")
@Operation(summary = "鑾峰緱閿�鍞椂闂存缁熻")
@Parameter(name = "count", description = "鏃堕棿娈垫暟閲�", example = "6")
--
Gitblit v1.9.3