From 7ee68df04b7a169d51ab95ad9955276c9aff6ee1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 22 九月 2025 09:44:34 +0800
Subject: [PATCH] 流程卡查询界面修改表格下方汇总方式
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index 0f800d3..967bcb7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -14,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
import java.sql.Date;
@RestController
@@ -73,15 +74,14 @@
@ApiOperation("鎶ュ伐鏌ヨ鎺ュ彛")
@SaCheckPermission("selectReportingWorks.search")
- @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}")
+ @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectDate}/{orderId}")
public Result selectReportingWork(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable String orderId,
@RequestBody ReportingWork reportingWork){
- return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectTime1,selectTime2,orderId,reportingWork));
+ return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectDate,orderId,reportingWork));
}
@@ -194,4 +194,14 @@
public Result saveWorkStorage( @RequestBody Map<String,Object> object){
return Result.seccess(reportingWorkService.saveWorkStorage(object));
- }}
+ }
+
+ @ApiOperation("Mes鎶ュ伐鍩虹鏁版嵁")
+ @PostMapping ("/mesBasicData")
+ public Result mesBasicData() {
+ return Result.seccess(reportingWorkService.mesBasicDataSv());
+ }
+
+}
+
+
--
Gitblit v1.8.0