From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 3a6f32e..96bdcb1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -29,11 +29,22 @@
}
//娴佺▼鍗¤繘搴�
- @ApiOperation("娴佺▼鍗¤繘搴�")
+ @ApiOperation("璁㈠崟娴佺▼鍗¤繘搴�")
@PostMapping("/processCardProgress/{orderId}")
public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
return Result.seccess(reportService.processCardProgressSv(orderId, columns));
}
+ @ApiOperation("鎶ヨ〃娴佺▼鍗¤繘搴�")
+ @PostMapping("/processCardProgressReport/{orderId}")
+ public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+ return Result.seccess(reportService.processCardProgressReportSv(orderId, columns));
+ }
+ @ApiOperation("娴佺▼鍗¤繘搴︽眹鎬�")
+ @SaCheckPermission("selectOrder.search")
+ @PostMapping("/processCardProgressCollect/{orderId}")
+ public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+ return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
+ }
@ApiOperation("璺ㄥ伐搴忔鐮�")
@PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
--
Gitblit v1.8.0