From 15a71ada8f34d31285400e9502182c62d2996708 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 14 一月 2026 15:22:25 +0800
Subject: [PATCH] fix: 取消直接连表，物料属性单查字典项过滤后当参数传递
---
inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
index ab44e9e..e83094e 100644
--- a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
@@ -25,27 +25,33 @@
isa.model AS sample_model,
io.ifs_inventory_id,
CONCAT(ip.inspection_item, ip.inspection_item_subclass) AS inspection_item_name,
- sto.object_type,
+ sto.object_type
FROM ins_product_deviation_warning ipdw
LEFT JOIN ins_sample isa ON isa.id = ipdw.ins_sample_id
LEFT JOIN ins_product ip ON ip.id = ipdw.ins_product_id
LEFT JOIN structure_item_parameter sip ON sip.id = ip.structure_item_parameter_id
LEFT JOIN ins_order io ON io.id = isa.ins_order_id
- LEFT JOIN structure_test_object sto ON sip.sample LIKE CONCAT('%"', sto.specimen_name, '"%')
+ LEFT JOIN structure_test_object sto
+ ON sip.sample LIKE CONCAT('%"', sto.specimen_name, '"%')
LEFT JOIN ifs_inventory_quantity ifs ON ifs.id = io.ifs_inventory_id
- LEFT JOIN sys_dict_data dict
- ON dict.dict_type = 'material_prop_type'
- AND dict.dict_value = ifs.material_prop
- AND dict.dict_value NOT IN ('04Dlan', '03Package')
- WHERE
- sto.object_type != 3 -- 杩囨护鏉′欢锛氭帓闄� object_type 涓� 3 鐨勮褰�
+ WHERE sto.object_type != 3
+ <if test="dictValues != null and dictValues.size() > 0">
+ AND ifs.material_prop IN
+ <foreach collection="dictValues" item="value" open="(" separator="," close=")">
+ #{value}
+ </foreach>
+ </if>
+ <if test="dictValues == null or dictValues.size() == 0">
+ AND 1 = 0
+ </if>
+ <if test="ew.sqlFirst != null">
+ ${ew.sqlFirst}
+ </if>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
AND ${ew.customSqlSegment}
</if>
- AND (ifs.material_prop IS NULL OR dict.dict_value IS NOT NULL)
) t
ORDER BY t.detection_time DESC
-
</select>
</mapper>
--
Gitblit v1.9.3