From a9ffa322f0cf794a7da8182e1be4ca34f5ea19b6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 25 七月 2025 13:34:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 8f64b3d..01bb4a6 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
@@ -131,11 +131,12 @@
@ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
@SaCheckPermission("taskCompletionStatus.search")
- @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}")
+ @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}/{orderId}")
public Result taskCompletionStatus(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
+ @PathVariable String orderId,
@RequestBody List<Integer> columns) {
- return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2, columns));
+ return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
}
@ApiOperation("璁㈠崟璁″垝鍒嗚В")
--
Gitblit v1.8.0