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/ProcessCardController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index c7111ab..b14eb64 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -28,14 +29,13 @@
//娴佺▼鍗＄鐞嗘煡璇�
@ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
@SaCheckPermission("selectProcessCard.search")
- @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectDate}")
public Result dateProcess(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize, selectTime1, selectTime2, flowCard));
+ return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
}
--
Gitblit v1.8.0