From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
index 42ac779..e83094e 100644
--- a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
@@ -31,21 +31,27 @@
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