From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..b5b0ee1 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -75,6 +75,7 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ qi.process,
CASE
WHEN qu.model = pm.id THEN pm.model
ELSE qu.model
@@ -85,6 +86,7 @@
END AS method
FROM quality_unqualified qu
LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
where
1=1
and qu.id = #{id}
--
Gitblit v1.9.3