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.数采新增字段
---
inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
index 4be6b91..dddb9c6 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
@@ -46,6 +46,7 @@
<result property="temperature" column="temperature"/>
<result property="humidity" column="humidity"/>
<result property="cableTag" column="cable_tag"/>
+ <result property="sort" column="sort"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
@@ -100,7 +101,8 @@
ip.method_s,
ip.tell,
ip.dic,
- ip.cable_tag
+ ip.cable_tag,
+ ip.sort
</sql>
<select id="selectRetestProduct" resultType="com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct">
@@ -169,7 +171,9 @@
and ins_fibers_id is null
and standard_method_list_id is not null
and ip.cable_tag is null
- and ip.retest_tag = #{retestTag}
+ <if test="retestTag != null and retestTag != ''">
+ and ip.retest_tag = #{retestTag}
+ </if>
</select>
<select id="getInsProductUnqualifiedRetest5" resultMap="product">
select <include refid="getInsProducSql"/>
--
Gitblit v1.9.3