From a3e0493b2f597e8c49ee80a0c7ab92bc30dc60a3 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 10 四月 2025 11:13:36 +0800
Subject: [PATCH] 检验任务,进货检验车间文件选择去掉后缀
---
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 fda176d..d9a1457 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -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