From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

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

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..705a3ff 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,6 +16,8 @@
         qu.deal_result,
         qu.deal_name,
         qu.deal_time,
+        qu.batch_no,
+        qu.check_type,
         CASE
         WHEN qu.model = pm.id THEN pm.model
         ELSE qu.model
@@ -28,20 +30,20 @@
         LEFT JOIN product_model pm ON qu.model = pm.id
         where
         1=1
-        <if test="qualityUnqualified.inspectType != null ">
-            AND inspect_type = #{qualityUnqualified.inspectType}
+        <if test="qualityUnqualified.checkType != null ">
+            AND check_type = #{qualityUnqualified.checkType}
         </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}
+            AND product_name like concat('%',#{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')
+            AND check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
         </if>
     </select>
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">

--
Gitblit v1.9.3