每日生产状态报表调整

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