From 12e35c60f9be4403b5cdec5f0d87c2d0f7384dd3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 六月 2024 10:28:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 17 +++++++++++++++--
1 files changed, 15 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 e5acab7..43cec1d 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,10 +1,12 @@
package com.yuanchu.mom.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.dto.FactoryDto;
+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;
@@ -26,8 +28,19 @@
List<StandardMethodList> getStandardMethodListBySample(String sampleType);
- List<StandardProductList> selectStandardProductListByTree(String tree1, String tree2);
+ 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);
}
--
Gitblit v1.9.3