From 2b7f4d1d5e7dc15c1c05120f543b61b9db5ca9ea Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 27 三月 2026 14:08:43 +0800
Subject: [PATCH] 新增巡检记录后,创建人未自动生成,未展示备注,且点击通知后无对应的通知消息展示

---
 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index b5b0ee1..7b48b5f 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,6 +16,7 @@
         qu.deal_result,
         qu.deal_name,
         qu.deal_time,
+        qu.quarantine_lifted,
         CASE
         WHEN qu.model = pm.id THEN pm.model
         ELSE qu.model
@@ -98,4 +99,28 @@
         where pm.model=#{model}
           and  p.product_name=#{productName}
     </select>
-</mapper>
+    <select id="selectUnqualifiedByProcessNames" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
+        SELECT DISTINCT qu.*
+        FROM quality_unqualified qu
+        JOIN quality_inspect qi ON qu.inspect_id = qi.id
+        WHERE qi.process IN
+        <foreach collection="processNames" item="processName" open="(" separator="," close=")">
+            #{processName}
+        </foreach>
+        AND qu.deal_result = '闅旂'
+        AND qu.quarantine_lifted = false
+    </select>
+
+    <select id="selectUnqualifiedWithProductionOrder" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
+        SELECT
+        po.id as productOrderId,
+        po.nps_no as productOrderNpsNo
+        FROM quality_unqualified qu
+        LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
+        LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
+        LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+        LEFT JOIN product_order po ON pwo.product_order_id = po.id
+        WHERE po.id IS NOT NULL
+        GROUP BY po.id
+    </select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3