From e72766e5c5cceae416c0fa17ef075a01cd3fd396 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 09:34:34 +0800
Subject: [PATCH] 检验任务筛选增加人员字段+检验和复核支持样品编号的修改
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 9 +++++----
1 files changed, 5 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 951385d..5f450ba 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
@@ -25,19 +25,19 @@
*/
public interface InsSampleMapper extends BaseMapper<InsSample> {
- IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userName") String userName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
+ IPage<InsOrderPlanVO> findInsSampleAndOrder(@Param("page") Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("myName") String myName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory, @Param("sampleCode") String sampleCode);
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);
- List<SampleProductDto> getInsOrderAndSample2(Integer id, String laboratory);
+ SampleProductDto getInsOrderAndSample(Integer sampleId, String laboratory);
+ SampleProductDto getInsOrderAndSample2(Integer sampleId, String laboratory);
String getSampleEn(String sample);
@@ -60,6 +60,7 @@
//鏌ヨ涓旇繃婊ゅ嚭鏈夌數璺瘯楠岀殑鏍峰搧
List<InsSample> selectSample(Integer insOrderId);
+
}
--
Gitblit v1.9.3