From f23f738ef96450ca27591b92c9d53437630a0d9a Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Thu, 10 Jul 2025 09:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E7=95=99=E6=A0=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E8=B4=A5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quality/QcCheckSampleTaskMapper.xml         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml
index c4193d6da..8287c345b 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml
@@ -55,22 +55,22 @@
         left join pro_order_workorder pow ON pow.workorder_code = task.order_no
         <where>
             <if test="queryDate != null and queryDate != ''">
-                and CONVERT(VARCHAR(10), create_time ,23)  <![CDATA[ = ]]> #{queryDate}
+                and CONVERT(VARCHAR(10), task.create_time ,23)  <![CDATA[ = ]]> #{queryDate}
             </if>
             <if test="startSampleDate != null and startSampleDate != ''">
-                and CONVERT(VARCHAR(10), sample_time ,23)  <![CDATA[ >= ]]> #{startSampleDate}
+                and CONVERT(VARCHAR(10), task.sample_time ,23)  <![CDATA[ >= ]]> #{startSampleDate}
             </if>
             <if test="endSampleDate != null and endSampleDate != ''">
-                and CONVERT(VARCHAR(10), sample_time ,23)  <![CDATA[ <= ]]> #{endSampleDate}
+                and CONVERT(VARCHAR(10), task.sample_time ,23)  <![CDATA[ <= ]]> #{endSampleDate}
             </if>
             <if test="materialName != null and materialName != ''">
-                and material_name like concat('%', #{materialName}, '%')
+                and task.material_name like concat('%', #{materialName}, '%')
             </if>
             <if test="workOrderCodeSap != null and workOrderCodeSap != ''">
                 and SUBSTRING ( pow.workorder_code_sap, 4, 12 ) <![CDATA[ = ]]> #{workOrderCodeSap}
             </if>
         </where>
-        order by sample_time desc,task.create_time desc
+        order by task.sample_time desc,task.create_time desc
     </select>