From 99cf848f87e2e06954d1ca101c9ff1879cf801c7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 五月 2025 15:15:45 +0800
Subject: [PATCH] 远场上传的文件解析调整+检验任务样品编号筛选
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 1c01c2d..225494f 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
@@ -11,6 +11,7 @@
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
+import com.yuanchu.mom.vo.SampleVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -24,27 +25,42 @@
*/
public interface InsSampleMapper extends BaseMapper<InsSample> {
- IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);
+ IPage<InsOrderPlanVO> findInsSampleAndOrder(@Param("page") Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userName") String userName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory, @Param("sampleCode") String sampleCode);
- IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);
+ 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);
+ 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);
+ SampleProductDto getInsOrderAndSample(Integer sampleId, String laboratory);
+ SampleProductDto getInsOrderAndSample2(Integer sampleId, 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);
+
+ //杩囨护鎺夋病鏈夋楠岄」鐩殑鏍峰搧
+ List<InsSample> selectSampleListByOrderId(Integer orderId);
+
+ List<InsSample> selectInsSample(@Param("ids") List<Integer> ids);
+
+ //鏌ヨ涓旇繃婊ゅ嚭鏈夌數璺瘯楠岀殑鏍峰搧
+ List<InsSample> selectSample(Integer insOrderId);
+
}
--
Gitblit v1.9.3