From cbadfd8e691ab335965202a984db16e55ac8e42c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 17:51:06 +0800
Subject: [PATCH] 诚发五金:按技术方案重构业务功能并补齐库结构
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 0175677..f1f72b0 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -8,6 +8,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestDeptStatisticsRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
@@ -34,12 +35,14 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -99,7 +102,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閲囪喘鐢宠")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<ErpPurchaseRequestRespVO> getPurchaseRequest(@RequestParam("id") Long id) {
ErpPurchaseRequestDO purchaseRequest = purchaseRequestService.getPurchaseRequest(id);
if (purchaseRequest == null) {
@@ -121,7 +123,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閲囪喘鐢宠鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<PageResult<ErpPurchaseRequestRespVO>> getPurchaseRequestPage(@Valid ErpPurchaseRequestPageReqVO pageReqVO) {
PageResult<ErpPurchaseRequestDO> pageResult = purchaseRequestService.getPurchaseRequestPage(pageReqVO);
return success(buildPurchaseRequestVOPageResult(pageResult));
@@ -183,11 +184,23 @@
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
return success(purchaseRequestService.getPurchaseRequestApproveProcessDefinitionList());
}
+ @GetMapping("/statistics/dept")
+ @Operation(summary = "鑾峰緱閲囪喘鐢宠閮ㄩ棬缁熻")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:statistics')")
+ public CommonResult<List<ErpPurchaseRequestDeptStatisticsRespVO>> getDeptStatistics(
+ @Parameter(name = "beginTime", description = "鐢宠鏃堕棿寮�濮�", example = "2026-01-01 00:00:00")
+ @RequestParam(value = "beginTime", required = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @Parameter(name = "endTime", description = "鐢宠鏃堕棿缁撴潫", example = "2026-12-31 23:59:59")
+ @RequestParam(value = "endTime", required = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+ return success(purchaseRequestService.getDeptStatistics(beginTime, endTime));
+ }
+
@PostMapping("/generate-order")
@Operation(summary = "鐢熸垚閲囪喘璁㈠崟")
@PreAuthorize("@ss.hasPermission('erp:purchase-request:generate-order')")
--
Gitblit v1.9.3