From c39517f22b502e2d1ec155beda41162c749f2c26 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期日, 28 四月 2024 14:34:21 +0800
Subject: [PATCH] 2024-4-28 word转pdf完成
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 1e6fdd4..d5f28cd 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -47,7 +47,13 @@
</resultMap>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select factory,laboratory,sample_type,sample,model from standard_tree
+# select factory,laboratory,sample_type,sample,model from standard_tree
+ select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory, l.laboratory_name laboratory, sto.specimen_name sample_type, p.name sample, st.model from laboratory l
+ left join structure_test_object sto on sto.laboratory_id = l.id
+ left join product p on p.object_id = sto.id
+ left join standard_tree st on st.laboratory = l.laboratory_name
+ and st.sample_type = sto.specimen_name
+ and st.sample = p.name
</select>
<select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -98,14 +104,31 @@
ask,
ask_tell as tell
from structure_item_parameter sp
- left join structure_test_object sto on sto.id = sp.sample
- where sto.specimen_name = #{sampleType}
+ where sp.sample = #{sampleType}
+ or sp.sample = ''
+ or sp.sample = '[]'
</select>
<select id="getStandardMethodListBySample" resultType="com.yuanchu.mom.pojo.StandardMethodList">
select sm.code,sm.name,sm.remark from standard_method sm
left join structure_test_object sto on sm.structure_test_object_id = sto.id
- where sto.specimen_name = #{sampleType}
- and is_use = 1
+ where is_use = 1
and is_product = 1
+ <if test="sampleType != null">
+ and sto.specimen_name = #{sampleType}
+ </if>
+ </select>
+ <select id="selectStandardTreeList2" resultType="com.yuanchu.mom.pojo.StandardTree">
+ select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ l.laboratory_name laboratory,
+ sto.specimen_name sample_type,
+ p.name sample
+ from laboratory l
+ left join structure_test_object sto on sto.laboratory_id = l.id
+ left join product p on p.object_id = sto.id
+ left join standard_tree st on st.laboratory = l.laboratory_name
+ and st.sample_type = sto.specimen_name
+ and st.sample = p.name
+ where sto.specimen_name = #{sampleType}
+ group by sto.specimen_name
</select>
</mapper>
--
Gitblit v1.9.3