From e639e633e0a5e71fc0e6b8082da8c9f3e66e3d48 Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Sat, 9 May 2026 11:28:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(qms-pdi):=20=E4=BF=AE=E5=A4=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E6=A3=80=E6=B5=8B=E9=A1=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改固定条件逻辑为已完成/待流转且总体不合格或存在不合格检测项
- 将inspection_inspection判断调整为false或存在不合格检测项时生效
- 优化子查询条件，保证满足任一不合格情况均被选中
- 修正XML语法，使条件表达更准确明确
---
 .../resources/mapper/QmsPdiTaskRecordMapper.xml  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml
index 4c5473a6..bff3f47d 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml
@@ -105,14 +105,16 @@
         LEFT JOIN "user" ua ON ua.id = t.assistant_id
         LEFT JOIN qms_issue_ticket it ON it.source_type = 1 AND it.source_id = t.id
         <where>
-            <!-- 固定条件：已完成/待流转 + 不合格 + 存在不合格检测项 -->
+            <!-- 固定条件：已完成/待流转，且（总体不合格 或 存在不合格检测项） -->
             AND t.inspection_enable IN (2, 3)
-            AND t.inspection_inspection = false
-            AND EXISTS (
-                SELECT 1
-                FROM qms_pdi_inspection_results ir
-                WHERE ir.task_id = t.id
-                  AND ir.inspection_item_results = false
+            AND (
+                t.inspection_inspection = false
+                OR EXISTS (
+                    SELECT 1
+                    FROM qms_pdi_inspection_results ir
+                    WHERE ir.task_id = t.id
+                      AND ir.inspection_item_results = false
+                )
             )
             <if test="request.inspectionType != null">
                 AND r.inspection_type = #{request.inspectionType}