Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev

chenrui

2025-03-14 9687fd99fdf6208dbf747ea45c440f192a9af815

 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
@@ -31,15 +32,12 @@

    List<StandardMethodList> getStandardMethodListBySample(String sampleType);

    List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees, String laboratory);
    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(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 +83,19 @@
     */
    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);
}