From a27ce393f9924c044dfe743b220f0300f33e79d3 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期二, 06 八月 2024 15:47:14 +0800
Subject: [PATCH] 合并相关文件
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 feb327f..5a881f3 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
@@ -57,16 +57,16 @@
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
@SaCheckPermission("WorkInProgress.search")
- @PostMapping("/workInProgress/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+ @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgress(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
@PathVariable String orderId,
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
- @RequestBody Report report) {
- return Result.seccess(reportService.workInProgressSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses,optionVal, report));
+ @RequestBody WorkInProgressDTO workInProgressDTO) {
+ return Result.seccess(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));
}
--
Gitblit v1.8.0