From 71a989bb2064b0f8c376c11b4586ce4b747f4fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 12 May 2026 14:16:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(repository):=20=E4=BF=AE=E6=AD=A3QmsIncomin?=
 =?UTF-8?q?gInspectionTask=E4=B8=AD=E8=BF=87=E6=9C=9F=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将isOverdue过滤条件从<if>移动到<choose>的<when>分支中
- 消除重复的isOverdue过滤判断，避免条件冲突
- 优化查询条件逻辑，提高代码可读性和维护性
---
 .../resources/mapper/QmsIncomingInspectionTaskMapper.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
index db38d286..0ce5d5d1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
@@ -149,6 +149,9 @@
         LEFT JOIN qms_incoming_inspection_task t2 ON t.related_task_id = t2.id
         <where>
             <choose>
+                <when test="request.isOverdue != null">
+                    t.is_overdue = #{request.isOverdue}
+                </when>
                 <when test="request.inspectionStatus != null">
                     t.inspection_status = #{request.inspectionStatus}
                 </when>
@@ -157,9 +160,6 @@
                 </otherwise>
             </choose>
             AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId})
-            <if test="request.isOverdue != null">
-                AND t.is_overdue = #{request.isOverdue}
-            </if>
             <if test="request.key != null and request.key != ''">
                 AND (m.material_no ilike concat('%', #{request.key}, '%')
                     or m.material_desc ilike concat('%', #{request.key}, '%')