From 39e6d6469b652daaf4af66b8b75f8dad2f95923c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 18 五月 2026 14:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 503b7b3..49380aa 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -84,9 +84,16 @@
ELSE false
END AS method
FROM quality_unqualified qu
- LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN product_model pm ON qu.product_model_id = pm.id
where
1=1
and qu.id = #{id}
</select>
+ <select id="getModelId" resultType="java.lang.Long">
+ select pm.id
+ from product_model pm
+ left join product p on pm.product_id=p.id
+ where pm.model=#{model}
+ and p.product_name=#{productName}
+ </select>
</mapper>
--
Gitblit v1.9.3