From 8dcefe8d8faa04997e75aa0f8c62b6e715d81b98 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:08:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index ca5e74e..70c2bbf 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -461,13 +461,17 @@
select d.device_name, d.management_number, d.file_type, d.collect_url
FROM
device d,
- structure_item_parameter sip
+ device_data_config ddc
+ <if test="sample != '' and sample != null">
+ inner join structure_item_parameter sip on sip.sample like concat('%', #{sample}, '%') and sip.id = ddc.structure_item_parameter_id
+ </if>
where d.ip = #{ip}
- and sip.inspection_item = #{inspectionItem}
+ and ddc.inspection_item = #{inspectionItem}
<if test="inspectionItemSubclass != '' and inspectionItemSubclass != null">
- and sip.inspection_item_subclass = #{inspectionItemSubclass}
+ and ddc.inspection_item_subclass = #{inspectionItemSubclass}
</if>
and d.device_status = 0
and d.ins_product_ids is not null
+ limit 1
</select>
</mapper>
--
Gitblit v1.9.3