From 22d3a8dc4185c5461bee9e42a9f4a2775ff448e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 九月 2024 17:28:17 +0800
Subject: [PATCH] 报告更改+再次试验

---
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index de7ba20..28d3c7e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -30,26 +30,29 @@
     IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
 
     List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
+    List<SampleProductDto> selectSampleProductListByOrder2Id(Integer id);
 
     List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
+    List<SampleProductDto> selectSampleProductListByOrder2Id2(Integer id);
 
     List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids);
 
     List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
+    List<SampleProductDto> getInsOrderAndSample2(Integer id, String laboratory);
 
     String getSampleEn(String sample);
 
-    List<InsProduct> getInsProduct1(Integer id, String laboratory);
-
-    List<InsProduct> getInsProduct2(Integer id);
-
-    List<InsProduct> getInsProduct3(Integer id);
+    List<InsProduct> getInsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory);
+    List<InsProduct> getIns2Product1(@Param("id") Integer id, @Param("laboratory") String laboratory);
+    List<InsProduct> get2InsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("num") Integer num);
 
     List<Map<String, Object>> getReportModel(@Param("orderId") Integer orderId, @Param("id") Integer id, @Param("laboratory") String laboratory);
 
     SampleVo getDetailById(Integer sampleId);
 
     String selMethodById(Integer sampleId);
+
+    List<Map<String, String>> selectSampleList(Integer orderId);
 }
 
 

--
Gitblit v1.9.3