From 54aff4794f199c40323e8704f660819b73fea768 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 28 九月 2025 16:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index daad498..d824587 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -12,6 +12,7 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Set;
/**
* @author Administrator
@@ -29,17 +30,12 @@
List<StandardProductList> getStandardProductListBySample(String sampleType);
- List<StandardMethodList> getStandardMethodListBySample(String sampleType);
-
List<StandardProductList> selectStandardProductListByTree(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
List<StandardProductList> selectStandardProductListByTree2(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
List<SampleTypeDto> getStandardTree2();
-
- List<SampleDto> getStandardTree3(String sampleType);
-
String getLaboratory(String str);
@@ -85,6 +81,27 @@
*/
IPage<IfsInventoryQuantitySupplierDto> getIfsByQuarter(Page<IfsInventoryQuantitySupplierDto> page, @Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);
+ /**
+ * 鎵归噺鏌ヨ鏍�
+ * @param sampleTypeValues
+ * @return
+ */
+ List<SampleDto> getStandardTree3Batch(@Param("sampleTypeValues") Set<String> sampleTypeValues);
+
+ /**
+ * 鏌ヨ鏍�
+ * @param sampleType
+ * @return
+ */
+ List<SampleDto> getStandardTree3(@Param("sampleType") String sampleType);
+
+ /**
+ * 鏍规嵁鍘熸潗鏂檌d鍒楄〃鏌ヨ鍘熸潗鏂欎俊鎭�
+ * @param ifsIds
+ * @return
+ */
+ List<IfsInventoryQuantitySupplierDto> getIfsByIds(@Param("ifsIds") List<String> ifsIds);
+
}
--
Gitblit v1.9.3