From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)

---
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 28d3c7e..972f6b6 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
@@ -29,16 +29,15 @@
 
     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);
+    SampleProductDto selectSampleProductListByOrderId(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);
+    SampleProductDto getInsOrderAndSample(Integer sampleId, String laboratory);
+    SampleProductDto getInsOrderAndSample2(Integer sampleId, String laboratory);
 
     String getSampleEn(String sample);
 
@@ -53,6 +52,14 @@
     String selMethodById(Integer sampleId);
 
     List<Map<String, String>> selectSampleList(Integer orderId);
+
+    //杩囨护鎺夋病鏈夋楠岄」鐩殑鏍峰搧
+    List<InsSample> selectSampleListByOrderId(Integer orderId);
+
+    List<InsSample> selectInsSample(@Param("ids") List<Integer> ids);
+
+    //鏌ヨ涓旇繃婊ゅ嚭鏈夌數璺瘯楠岀殑鏍峰搧
+    List<InsSample> selectSample(Integer insOrderId);
 }
 
 

--
Gitblit v1.9.3