From af1ef97f554b67140773103a3e90bc95b80c5b54 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期一, 21 四月 2025 08:54:05 +0800 Subject: [PATCH] 原材料和成品可根据选择行导出 --- basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 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 4deb5df..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> selectStandardProductListByTree(String tree, String sample, String model, String trees, String laboratory); - - List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees, 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