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/ErpPurchaseStatisticsController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java
index fb41681..203d45a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java
@@ -2,14 +2,20 @@
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchasePriceAnalysisRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseStatisticsReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSupplierStatisticsRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseTimeSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseUncompletedOrderRespVO;
import cn.iocoder.yudao.module.erp.service.statistics.ErpPurchaseStatisticsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -40,12 +46,14 @@
LocalDateTime yesterday = LocalDateTimeUtils.getYesterday();
LocalDateTime month = LocalDateTimeUtils.getMonth();
LocalDateTime year = LocalDateTimeUtils.getYear();
- ErpPurchaseSummaryRespVO summary = new ErpPurchaseSummaryRespVO()
+ // 1.1 姒傝锛氳鍗� / 鍏ュ簱 / 閫�璐х殑鎬绘暟涓庢�婚噾棰�
+ ErpPurchaseSummaryRespVO summary = purchaseStatisticsService.getPurchaseSummary();
+ // 1.2 棣栭〉鐪嬫澘锛氫粖鏃� / 鏄ㄦ棩 / 鏈湀 / 浠婂勾閲囪喘閲戦锛堝鐢ㄥ悓涓�鍝嶅簲锛岄伩鍏嶄袱濂楁帴鍙ｏ級
+ return success(summary
.setTodayPrice(purchaseStatisticsService.getPurchasePrice(today, null))
.setYesterdayPrice(purchaseStatisticsService.getPurchasePrice(yesterday, today))
.setMonthPrice(purchaseStatisticsService.getPurchasePrice(month, null))
- .setYearPrice(purchaseStatisticsService.getPurchasePrice(year, null));
- return success(summary);
+ .setYearPrice(purchaseStatisticsService.getPurchasePrice(year, null)));
}
@GetMapping("/time-summary")
@@ -64,4 +72,28 @@
return success(summaryList);
}
+ @GetMapping("/supplier")
+ @Operation(summary = "鑾峰緱渚涘簲鍟嗕緵璐х粺璁�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-statistics:query')")
+ public CommonResult<PageResult<ErpPurchaseSupplierStatisticsRespVO>> getSupplierStatistics(
+ @Valid ErpPurchaseStatisticsReqVO reqVO) {
+ return success(purchaseStatisticsService.getSupplierStatistics(reqVO));
+ }
+
+ @GetMapping("/price")
+ @Operation(summary = "鑾峰緱閲囪喘浠锋牸鍒嗘瀽")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-statistics:query')")
+ public CommonResult<PageResult<ErpPurchasePriceAnalysisRespVO>> getPriceAnalysis(
+ @Valid ErpPurchaseStatisticsReqVO reqVO) {
+ return success(purchaseStatisticsService.getPriceAnalysis(reqVO));
+ }
+
+ @GetMapping("/uncompleted")
+ @Operation(summary = "鑾峰緱鏈畬鎴愰噰璐鍗曡窡韪�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-statistics:query')")
+ public CommonResult<PageResult<ErpPurchaseUncompletedOrderRespVO>> getUncompletedOrders(
+ @Valid ErpPurchaseStatisticsReqVO reqVO) {
+ return success(purchaseStatisticsService.getUncompletedOrders(reqVO));
+ }
+
}
--
Gitblit v1.9.3