From 812f2de34b5713c4da08932d95e634de81e9b248 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 20 六月 2026 19:52:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

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

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 503b7b3..df2d565 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -43,7 +43,9 @@
         <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
             AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
         </if>
+        order by qu.check_time desc
     </select>
+
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
         SELECT
         *
@@ -84,9 +86,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