From d8187dc27ddce838bf940e487c6e9a587c146639 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 10:59:09 +0800
Subject: [PATCH] feat: 山西德益科技分支功能合并

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

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..d995258 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -26,23 +26,24 @@
         END AS method
         FROM quality_unqualified qu
         LEFT JOIN product_model pm ON qu.model = pm.id
-        where
-        1=1
-        <if test="qualityUnqualified.inspectType != null ">
-            AND inspect_type = #{qualityUnqualified.inspectType}
-        </if>
-        <if test="qualityUnqualified.inspectState != null ">
-            AND inspect_state = #{qualityUnqualified.inspectState}
-        </if>
-        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
-            AND product_name = #{qualityUnqualified.productName}
-        </if>
-        <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
-            AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
-        </if>
-        <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
-            AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
-        </if>
+        <where>
+            <if test="qualityUnqualified.inspectType != null ">
+                AND inspect_type = #{qualityUnqualified.inspectType}
+            </if>
+            <if test="qualityUnqualified.inspectState != null ">
+                AND inspect_state = #{qualityUnqualified.inspectState}
+            </if>
+            <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
+                AND product_name = #{qualityUnqualified.productName}
+            </if>
+            <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
+                AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
+                AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
+            </if>
+        </where>
+        order by qu.create_time desc
     </select>
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
         SELECT
@@ -84,7 +85,7 @@
                 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}

--
Gitblit v1.9.3