生产状态报表工序状态加未完成

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>