From ad54d502450e219c38f7d9b878ae07f759ab2a23 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 5f8c2cb..4c771de 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -130,7 +130,7 @@
group by sto.specimen_name
</select>
<select id="selectStandardProductListByTree" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select sample,
+ select sample sample2,
inspection_item,
inspection_item_en,
inspection_item_subclass,
@@ -152,7 +152,10 @@
checkout_number,
section,
dic,
- 0 state
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree
from structure_item_parameter
where (
sample is NULL
@@ -162,6 +165,37 @@
)
</select>
+ <select id="selectStandardProductListByTree2" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select sample sample2,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ method,
+ son_laboratory,
+ unit,
+ ask_tell tell,
+ ask,
+ price,
+ man_hour,
+ man_hour_group,
+ man_day,
+ inspection_item_type,
+ inspection_value_type,
+ bsm,
+ template_id,
+ laboratory,
+ checkout_number,
+ section,
+ dic,
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree
+ from structure_item_parameter
+ where sample LIKE CONCAT('%[', #{tree}, ']%')
+ </select>
+
<select id="getStandardTree2" resultMap="SampleTypeDto">
select sto.specimen_name sample_type,
p.name sample,
--
Gitblit v1.9.3