From 7347fb4911ca1a861bb8580adb2d4acd292c0d50 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 7 Sep 2021 10:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=94=9F=E4=BA=A7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/ReportDataMapper.xml     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index 61daf532..6bb7deec 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -165,20 +165,24 @@
             AND ZSD.SFC = #{sfc}
         </if>
         <if test="routerType != null and routerType != ''" >
-            <if test="routerType = 'C'.toString()" >
-                AND RU.ROUTER_TYPE = #{routerType}
-            </if>
-            <if test="routerType != 'C'.toString()" >
-                AND RU.ROUTER_TYPE != #{routerType}
-            </if>
+            <choose>
+                <when test="routerType != 'OTHER'.toString()">
+                    AND RU.ROUTER_TYPE = #{routerType}
+                </when>
+                <otherwise>
+                    AND RU.ROUTER_TYPE != 'C'
+                </otherwise>
+            </choose>
         </if>
         <if test="operationStatus != null and operationStatus != ''" >
-            <if test="operationStatus = 'OTHER'.toString()" >
-                AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL'
-            </if>
-            <if test="operationStatus != 'OTHER'.toString()" >
-                AND ZSD.DISPATCH_STATUS = #{operationStatus}
-            </if>
+            <choose>
+                <when test="operationStatus != 'OTHER'.toString()">
+                    AND ZSD.DISPATCH_STATUS = #{operationStatus}
+                </when>
+                <otherwise>
+                    AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL'
+                </otherwise>
+            </choose>
         </if>
         <if test="startFromDate != null and startFromDate != ''" >
             AND ZSD.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - 8/24