From 56341ed5e8671f7002c295a371d6d4dcf0c55012 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 16 四月 2025 16:48:05 +0800
Subject: [PATCH] 1。检验项目导入新增字段 2.数采新增字段

---
 basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index fda176d..7be661e 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,7 @@
     <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">
@@ -209,14 +210,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 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