From d98ca6e960a7ea69fd4385fbd34887a4c86dc317 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 六月 2024 09:01:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 a5b5277..0666f69 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
@@ -1,11 +1,13 @@
package com.yuanchu.mom.mapper;
+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;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
@@ -27,9 +29,21 @@
List<StandardMethodList> getStandardMethodListBySample(String sampleType);
- List<StandardProductList> selectStandardProductListByTree(String tree);
+ List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees);
+
+ List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees);
+
+ List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees);
List<SampleTypeDto> getStandardTree2();
+
+ List<SampleDto> getStandardTree3(String sampleType);
+
+ String getLaboratory(String str);
+
+ Integer getStructureItemParameterId(String sampleType, String item, String itemChild);
+
+ List<ProductDto> selectPList(String name);
}
--
Gitblit v1.9.3