From 5101e344b4ac9de94d0f18d8a501158be49221ff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 二月 2025 10:27:00 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 74ded82..e97a9cd 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -212,14 +212,6 @@
and st.sample = p.name
</select>
- <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
- select model label,
- model value
- from standard_tree
- where sample_type = #{sampleType}
- and sample is null
- </select>
-
<select id="getLaboratory" resultType="java.lang.String">
select l.laboratory_name
from structure_test_object sto
@@ -381,4 +373,15 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="getStandardTree3Batch" resultType="com.ruoyi.basic.dto.SampleDto">
+ select model label,
+ model value
+ from standard_tree
+ where sample_type in
+ <foreach item="item" collection="sampleTypeValues" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ and sample is null
+ </select>
</mapper>
--
Gitblit v1.9.3