From 5c92f5ec07c74272c7bfd658ef9c9f5ceb02cfb1 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 17:00:16 +0800
Subject: [PATCH] 统计图表、任务展示代码搬迁

---
 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..a5087ef 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,12 +33,13 @@
 
     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);
 
-    Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);
+    IPage<CostStatisticsDto> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);
 
     Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto);
 

--
Gitblit v1.9.3