From b7c4edd36912d26aa2e8e6fa5605c370bb2e478a Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期四, 13 三月 2025 09:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
index e585141..59e305d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -20,7 +20,7 @@
public interface InsOrderService extends IService<InsOrder> {
//鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹�
- Map<String, Object> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto);
+ IPage<SampleOrderDto> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto);
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrder(UpInsOrderDTO upInsOrderDTO);
@@ -33,7 +33,8 @@
Map<String, Object> getInsOrderAndSample(Integer id, String laboratory);
- Map<String, Object> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto);
+ List<SampleProductDto2> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto);
+
List<Map<String, Object>> viewDetails(Map<String,Object> map);
void exportChecked(Map<String,Object> data, HttpServletResponse response);
--
Gitblit v1.9.3