From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6f450e0..ca5e74e 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -458,10 +458,16 @@
</select>
<select id="getDeviceMessage" resultType="java.util.Map">
- select d.*
- from device d, structure_item_parameter sip
+ select d.device_name, d.management_number, d.file_type, d.collect_url
+ FROM
+ device d,
+ structure_item_parameter sip
where d.ip = #{ip}
and sip.inspection_item = #{inspectionItem}
- limit 1
+ <if test="inspectionItemSubclass != '' and inspectionItemSubclass != null">
+ and sip.inspection_item_subclass = #{inspectionItemSubclass}
+ </if>
+ and d.device_status = 0
+ and d.ins_product_ids is not null
</select>
</mapper>
--
Gitblit v1.9.3