From 81cad8df0f1b33700e7fc80f271eda7f1180efb0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:17 +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 | 15 ++++++++++++++-
1 files changed, 14 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 68f2b56..1a8f7e0 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
@@ -36,7 +36,7 @@
}
@ApiOperation("鎶ヨ〃娴佺▼鍗¤繘搴�")
@PostMapping("/processCardProgressReport/{orderId}")
- public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+ public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<String> columns) {
return Result.seccess(reportService.processCardProgressReportSv(orderId, columns));
}
@ApiOperation("娴佺▼鍗¤繘搴︽眹鎬�")
@@ -83,6 +83,19 @@
}
+ @ApiOperation("宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�")
+ @PostMapping("/selectProcessCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
+ public Result selectProcessCompleted(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+
+ }
+
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
@PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
public Result damageReport(
--
Gitblit v1.8.0