Merge remote-tracking branch '惠信/qms/develop' into qms/develop

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}