From 6fb742d463ecac5e7d4934d7248a40979edc3626 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 21 七月 2025 14:33:25 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns
---
inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
index 24007fb..a585358 100644
--- a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
@@ -4,18 +4,41 @@
<!-- 鏌ョ湅棰勮鍒楄〃 -->
<select id="selectDeviationWarningPage" resultType="com.ruoyi.inspect.dto.InsProductDeviationWarningDto">
- select *
- from (select ipdw.*,
- isa.sample sample_name,
- isa.model sample_model,
- concat(ip.inspection_item, ip.inspection_item_subclass) inspection_item_name
- 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) a
+<!-- select *-->
+<!-- from (select ipdw.*,-->
+<!-- isa.sample sample_name,-->
+<!-- isa.model sample_model,-->
+<!-- concat(ip.inspection_item, ip.inspection_item_subclass) inspection_item_name-->
+<!-- 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) a-->
+<!-- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">-->
+<!-- ${ew.customSqlSegment}-->
+<!-- </if>-->
+<!-- order by ipdw.detection_time desc-->
+ SELECT
+ a.*,
+ sto.object_type
+ FROM (
+ SELECT
+ ipdw.*,
+ sip.sample AS sss,
+ isa.sample AS sample_name,
+ isa.model AS sample_model,
+ CONCAT(ip.inspection_item, ip.inspection_item_subclass) AS inspection_item_name
+ 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
+ ) a
+ LEFT JOIN structure_test_object sto
+ ON a.sss LIKE CONCAT('%"', sto.specimen_name, '"%') -- 妯＄硦鍖归厤
+ WHERE
+ sto.object_type != 3 -- 杩囨护鏉′欢锛氭帓闄� object_type 涓� 3 鐨勮褰�
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
+ AND ${ew.customSqlSegment}
</if>
- order by ipdw.detection_time desc
+ ORDER BY a.detection_time DESC
</select>
</mapper>
--
Gitblit v1.9.3