From 51d4ff2a9ac6c236203d86e97cc69104901c22e0 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 14 Dec 2022 17:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E5=B7=A5=E5=BA=8F=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anomaly/src/main/resources/mapper/ReportMapper.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 7a3b9c11..2f3acdfe 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -3150,12 +3150,13 @@ SELECT zab.CREATED_DATE_TIME,
         ELSE 0 END) "unWorkHours8",
         WCT.DESCRIPTION     WORK_CENTER_DESCRIPTION,
         RT.DESCRIPTION      RESOURCE_TYPE_DESCRIPTION
-        FROM (WITH DIS AS (SELECT MIN(ZSD.DISPATCH_NO) DISPATCH_NO
+        FROM (WITH DIS AS (SELECT MIN(CASE
+        WHEN ZSD.DISPATCH_STATUS != 'CANCEL' THEN
+        ZSD.DISPATCH_NO END) DISPATCH_NO
         FROM Z_SFC_DISPATCH ZSD
         GROUP BY ZSD.SFC)
         SELECT NZSD.*
-        FROM (
-        SELECT OZSD.*,
+        FROM (SELECT OZSD.*,
         CASE
         WHEN DIS.DISPATCH_NO = OZSD.DISPATCH_NO AND OZSD.DISPATCH_STATUS != 'COMPLETE'
         THEN N'COMPLETE'
@@ -3164,7 +3165,6 @@ SELECT zab.CREATED_DATE_TIME,
         FROM Z_SFC_DISPATCH OZSD
         LEFT JOIN DIS ON DIS.DISPATCH_NO = OZSD.DISPATCH_NO
         WHERE OZSD.DISPATCH_STATUS != 'CANCEL'
-        AND OZSD.DISPATCH_STATUS != 'PAUSE'
         ORDER BY OZSD.SFC, OZSD.DISPATCH_NO) NZSD
         WHERE NZSD.DISPATCH_STATUS != 'COMPLETE'
         AND NZSD.PREVIOUS_STATUS = 'COMPLETE') ZSD