From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 47db3aa..4a7b154 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -36,14 +36,14 @@
@ApiOperation(value = "鍔ㄦ�佽幏鍙杢ab琛ㄥご")
@GetMapping("/getTabHeader")
- public Result<?> getTabHeader(@RequestParam("sonLaboratory") String sonLaboratory, @RequestParam("samples") String samples) {
+ public Result<?> getTabHeader(@RequestParam("sonLaboratory") String sonLaboratory, String samples) {
return Result.success(insOrderPlanService.getTabHeader(sonLaboratory, samples));
}
@ApiOperation(value = "鏌ョ湅缁撴灉鎸夐挳")
- @GetMapping("/getInsOrderPlanList")
- public Result getInsOrderPlanList(@RequestBody Map<String, Object> data) {
- return Result.success(insOrderPlanService.getInsOrderPlanList(data));
+ @PostMapping("/getInsOrderPlanList")
+ public Result getInsOrderPlanList(@RequestBody QueryResultDTO queryResultDTO) {
+ return Result.success(insOrderPlanService.getInsOrderPlanList(queryResultDTO));
}
@ApiOperation(value = "瀵煎嚭濮旀墭璐圭敤")
@@ -59,8 +59,8 @@
}
@ApiOperation(value = "瀵煎嚭鏌ョ湅妫�楠岀粨鏋淓xcel")
- @GetMapping("/exportInsOrderPlanResult")
- public void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response) {
+ @PostMapping("/exportInsOrderPlanResult")
+ public void exportInsOrderPlanResult(@RequestBody QueryResultDTO data, HttpServletResponse response) {
insOrderPlanService.exportInsOrderPlanResult(data, response);
}
--
Gitblit v1.9.3