From 2eaeb19b16af087d17c186c6220bf64f2fc07f4f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:51:57 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 4060428..432cf08 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -49,6 +49,7 @@
<resultMap id="ModelDto" type="com.ruoyi.basic.dto.ModelDto">
<result property="label" column="model"/>
<result property="value" column="model"/>
+ <result property="standardTreeId" column="standard_tree_id"/>
</resultMap>
<sql id="selectStandardTree">
@@ -99,7 +100,8 @@
sto.id sample_type_id,
sto.sort,
sto.specimen_name_en sample_type_en,
- p.name_en sample_en
+ p.name_en sample_en,
+ st.id AS standard_tree_id
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
@@ -169,7 +171,7 @@
where sto.specimen_name = #{sampleType}
group by sto.specimen_name
</select>
- <select id="selectStandardProductListByTree" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree" resultType="com.ruoyi.basic.vo.StandardProductListVO">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where (
@@ -184,7 +186,7 @@
order by inspection_item_class, inspection_item, id asc
</select>
- <select id="selectStandardProductListByTree2" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree2" resultType="com.ruoyi.basic.vo.StandardProductListVO">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
@@ -330,6 +332,7 @@
${ew.customSqlSegment}
</if>
</select>
+
<select id="getIfsByOver" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
select * from (<include refid="getIfsOrder"/>
<where>
@@ -343,6 +346,7 @@
</if>
order by send_time desc
</select>
+
<select id="getIfsByOverList" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
select * from (<include refid="getIfsOrder"/>
<where>
@@ -384,7 +388,8 @@
<select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
select model label,
- model value
+ model value,
+ id AS standard_tree_id
from standard_tree
where sample_type = #{sampleType}
and sample is null
@@ -398,4 +403,23 @@
#{id}
</foreach>
</select>
+ <select id="selectStandardTreeById" resultType="com.ruoyi.basic.vo.StandardTreeVO">
+ select
+ st.id,
+ st.factory,
+ st.laboratory,
+ st.sample_type,
+ st.sample,
+ st.model,
+ st.create_user,
+ st.create_time,
+ st.update_user,
+ st.update_time,
+ u1.name AS create_user_name,
+ u2.name AS update_user_name
+ from standard_tree st
+ left join user u1 on st.create_user = u1.id
+ left join user u2 on st.update_user = u2.id
+ where st.id = #{standardTreeId}
+ </select>
</mapper>
--
Gitblit v1.9.3