From 7a40f887a2c06dea59c2d2b34846b579d133345d Mon Sep 17 00:00:00 2001
From: shihongwei <178899525@qq.com>
Date: Mon, 8 Jun 2026 15:01:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(security/HotVehicleThreeInspect):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=83=AD=E7=82=B9=E8=BD=A6=E8=BE=86=E4=B8=89?=
 =?UTF-8?q?=E6=A3=80=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除原硬编码的3个审核阶段限制，改为通过非空审核阶段数与已通过数相等判断审核完成状态
---
 .../HotVehicleThreeInspectMapper.xml          | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml b/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml
index 268c541..c344989 100644
--- a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml
+++ b/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml
@@ -48,12 +48,16 @@
         ELSE 0
         END AS completed,
         CASE
-        WHEN COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END) = 3
+        WHEN COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END) > 0
+        AND COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END)
+        = COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END)
         THEN '已完成审核'
         ELSE '未审核'
         END AS auditCompleteStatus,
         CASE
-        WHEN COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END) = 3
+        WHEN COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END) > 0
+        AND COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END)
+        = COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END)
         THEN 1
         ELSE 0
         END AS auditCompleted
@@ -144,12 +148,16 @@
         ELSE 0
         END AS completed,
         CASE
-        WHEN COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END) = 3
+        WHEN COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END) > 0
+        AND COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END)
+        = COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END)
         THEN '已完成审核'
         ELSE '未审核'
         END AS auditCompleteStatus,
         CASE
-        WHEN COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END) = 3
+        WHEN COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END) > 0
+        AND COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END)
+        = COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END)
         THEN 1
         ELSE 0
         END AS auditCompleted
@@ -240,12 +248,16 @@
         ELSE 0
         END AS completed,
         CASE
-        WHEN COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END) = 3
+            WHEN COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END) > 0
+                AND COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END)
+                     = COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END)
         THEN '已完成审核'
         ELSE '未审核'
         END AS auditCompleteStatus,
         CASE
-        WHEN COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END) = 3
+            WHEN COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END) > 0
+                AND COUNT(DISTINCT CASE WHEN t.inspect_phase IS NOT NULL THEN t.inspect_phase END)
+                     = COUNT(DISTINCT CASE WHEN t.flow_status = 'APPROVED' THEN t.inspect_phase END)
         THEN 1
         ELSE 0
         END AS auditCompleted