From 85b229604df27e6399e968076e3f366dc30e81b4 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期六, 03 八月 2024 22:35:30 +0800 Subject: [PATCH] 数采bug修复 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java index 43cec1d..be5575d 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yuanchu.mom.dto.FactoryDto; +import com.yuanchu.mom.dto.ProductDto; import com.yuanchu.mom.dto.SampleDto; import com.yuanchu.mom.dto.SampleTypeDto; import com.yuanchu.mom.pojo.StandardMethodList; @@ -11,11 +12,11 @@ import java.util.List; /** -* @author Administrator -* @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淢apper -* @createDate 2024-03-01 15:06:44 -* @Entity com.yuanchu.mom.pojo.StandardTree -*/ + * @author Administrator + * @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淢apper + * @createDate 2024-03-01 15:06:44 + * @Entity com.yuanchu.mom.pojo.StandardTree + */ public interface StandardTreeMapper extends BaseMapper<StandardTree> { List<FactoryDto> selectStandardTreeList(); @@ -28,11 +29,11 @@ List<StandardMethodList> getStandardMethodListBySample(String sampleType); - List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees); + List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees, String laboratory); - List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees); + List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees, String laboratory); - List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees); + List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees, String laboratory); List<SampleTypeDto> getStandardTree2(); @@ -40,7 +41,11 @@ String getLaboratory(String str); - Integer getStructureItemParameterId(String sampleType, String item, String itemChild); + Integer getStructureItemParameterId(String sampleType, String item, String itemChild, String inspectionItemClass); + + List<ProductDto> selectPList(String name); + + String selSample(String sample); } -- Gitblit v1.9.3