From 03df670a1dfbcae8031e84e15dff0b77365f0af6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 16:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_zss

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

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 61957ac..b15e3f9 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -7,14 +7,20 @@
         FROM quality_unqualified
         where
         1=1
-        <if test="qualityUnqualified.inspectType != null and qualityUnqualified.inspectType != '' ">
+        <if test="qualityUnqualified.inspectType != null ">
             AND inspect_type = #{qualityUnqualified.inspectType}
         </if>
-        <if test="qualityUnqualified.inspectState != null and qualityUnqualified.inspectState != '' ">
+        <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>
     </select>
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
@@ -23,10 +29,10 @@
         FROM quality_unqualified
         where
         1=1
-        <if test="qualityUnqualified.inspectType != null and qualityUnqualified.inspectType != '' ">
+        <if test="qualityUnqualified.inspectType != null">
             AND inspect_type = #{qualityUnqualified.inspectType}
         </if>
-        <if test="qualityUnqualified.inspectState != null and qualityUnqualified.inspectState != '' ">
+        <if test="qualityUnqualified.inspectState != null">
             AND inspect_state = #{qualityUnqualified.inspectState}
         </if>
         <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">

--
Gitblit v1.9.3