From 9f8f73240c885488fdffc1062826520cf7abb86b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 17:45:03 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index bf8a74d..d9a1457 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -92,7 +92,8 @@
inspection_item_class_en,
code,
radius_list,
- rates
+ rates,
+ delegate_request_flag
FROM
temp_sample A
LEFT JOIN
@@ -176,6 +177,7 @@
<select id="getItemTree" resultMap="itemDto">
SELECT
sto.id AS sId,
+ sto.specimen_name AS labelName,
CONCAT(sto.specimen_name, ' (', sto.object_type, ')') AS sName,
p.id AS pId,
p.name AS pName,
@@ -190,11 +192,13 @@
<resultMap id="itemDto" type="com.ruoyi.basic.dto.TestItemDto">
<result column="sId" property="id"/>
<result column="sName" property="name"/>
+ <result column="labelName" property="labelName"/>
<collection property="children" resultMap="productDto"/>
</resultMap>
<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>
<select id="selectItemParameterBySample" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
@@ -204,13 +208,17 @@
sample is NULL
OR sample = ''
or sample = '[]'
- OR sample LIKE CONCAT('%', #{sample}, '%')
+ OR sample LIKE CONCAT('%', #{structureItemParameterDto.tree}, '%')
)
+ <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 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