From d33ea51722e69f01c93538d1119e2e46cebd087f Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Thu, 10 Nov 2022 17:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8A=B6=E6=80=81=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=B7=A5=E5=BA=8F=E7=8A=B6=E6=80=81=E5=8A=A0=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/resources/mapper/ReportDataMapper.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index cc449511..19421367 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -429,11 +429,14 @@
         </if>
         <if test="operationStatus != null and operationStatus != ''" >
             <choose>
-                <when test="operationStatus != 'OTHER'.toString()">
-                    AND ZSD.DISPATCH_STATUS = #{operationStatus}
+                <when test="operationStatus == 'UN_FINISHED' ">
+                    AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL'
                 </when>
-                <otherwise>
+                <when test="operationStatus == 'OTHER' ">
                     AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL'
+                </when>
+                <otherwise>
+                    AND ZSD.DISPATCH_STATUS = #{operationStatus}
                 </otherwise>
             </choose>
         </if>