From ba5bd31ecf829d2b462bd3f62b566828b347a89a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 13:36:18 +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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index bf8a74d..fda176d 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,6 +192,7 @@
<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">
@@ -204,8 +207,11 @@
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 structureItemParameterDto.delegateRequestFlag == '1' ">
+ AND delegate_request_flag = #{structureItemParameterDto.delegateRequestFlag}
+ </if>
order by id asc
</select>
--
Gitblit v1.9.3