From c6ca78efd59710d1564aca05f70d2197f68feb4b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 19 三月 2025 15:59:46 +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/WorkOrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
index 2c980ad..668ca97 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -25,13 +26,12 @@
//鏌ヨ宸ュ崟
@ApiOperation("鏌ヨ宸ュ崟鎺ュ彛")
@SaCheckPermission("selectWorkOrder.search")
- @PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
+ @PostMapping ("/orderGlassDetail/{selectDate}/{state}")
public Result dateWork(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable Integer state,
@RequestBody OrderGlassDetail orderGlassDetail){
- return Result.seccess(workOrderService.defaultDateWork(selectTime1,selectTime2,state,orderGlassDetail));
+ return Result.seccess(workOrderService.defaultDateWork(selectDate,state,orderGlassDetail));
}
//杞敓浜ц鍗曟煡璇�
--
Gitblit v1.8.0