From ce5c5e897b288a27f00804b68e73647fdfc5b6a7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 29 四月 2025 10:15:11 +0800
Subject: [PATCH] 数采，成束释放
---
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index fda176d..a3316cc 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -93,7 +93,7 @@
code,
radius_list,
rates,
- delegate_request_flag
+ delegate_request_flag,frequency,rates_group
FROM
temp_sample A
LEFT JOIN
@@ -198,6 +198,17 @@
<resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">
<result column="pId" property="id"/>
<result column="pName" property="name"/>
+ <result column="labelName" property="labelName"/>
+ </resultMap>
+
+ <resultMap id="itemDto1" type="com.ruoyi.basic.dto.TestItemDto">
+ <result column="sId" property="id"/>
+ <result column="sName" property="name"/>
+ <collection property="children" resultMap="productDto1"/>
+ </resultMap>
+ <resultMap id="productDto1" type="com.ruoyi.basic.dto.ProductDto">
+ <result column="pId" property="id"/>
+ <result column="pName" property="name"/>
</resultMap>
<select id="selectItemParameterBySample" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
@@ -209,14 +220,15 @@
or sample = '[]'
OR sample LIKE CONCAT('%', #{structureItemParameterDto.tree}, '%')
)
- <if test="structureItemParameterDto.delegateRequestFlag != null and structureItemParameterDto.delegateRequestFlag !='' and structureItemParameterDto.delegateRequestFlag == '1' ">
+ <if test="structureItemParameterDto.delegateRequestFlag != null and structureItemParameterDto.delegateRequestFlag !='' ">
AND delegate_request_flag = #{structureItemParameterDto.delegateRequestFlag}
</if>
+
order by id asc
</select>
- <select id="getItemTreeProduct" resultMap="itemDto">
- select sto.id sId, sto.specimen_name sName, p.id pId, p.name pName
+ <select id="getItemTreeProduct" resultMap="itemDto1">
+ select sto.id sId, sto.specimen_name sName, p.name labelName, p.id pId, p.name pName
from structure_test_object sto
left join product p on p.object_id = sto.id
WHERE sto.object_type = #{objectType}
--
Gitblit v1.9.3