From 09e1c1155f4db6dc7a829e515337aa88ac4db81c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 18 八月 2025 13:24:14 +0800
Subject: [PATCH] 修改完善

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

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index f4fb205..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 qualityTestStandard.inspectType != '' ">
+        <if test="qualityUnqualified.inspectType != null ">
             AND inspect_type = #{qualityUnqualified.inspectType}
         </if>
-        <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+        <if test="qualityUnqualified.inspectState != null ">
             AND inspect_state = #{qualityUnqualified.inspectState}
         </if>
-        <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+        <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,13 +29,13 @@
         FROM quality_unqualified
         where
         1=1
-        <if test="qualityUnqualified.inspectType != null and qualityTestStandard.inspectType != '' ">
+        <if test="qualityUnqualified.inspectType != null">
             AND inspect_type = #{qualityUnqualified.inspectType}
         </if>
-        <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+        <if test="qualityUnqualified.inspectState != null">
             AND inspect_state = #{qualityUnqualified.inspectState}
         </if>
-        <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
             AND product_name = #{qualityUnqualified.productName}
         </if>
     </select>

--
Gitblit v1.9.3