From 8a63774671aef17807569d6fb631eca20d4696f0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 25 八月 2025 17:04:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 7 ++++++-
1 files changed, 6 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 6d2c01e..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,16 @@
}
//娴佺▼鍗¤繘搴�
- @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}")
--
Gitblit v1.8.0