From bc1b3ee367f7e9aef88fc59647a9631f39eca6b5 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期三, 23 四月 2025 09:19:55 +0800 Subject: [PATCH] 1.数采 2.国产网分仪 --- basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml index d9c76cc..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"> @@ -212,11 +213,12 @@ <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