|
@@ -1305,9 +1305,14 @@
|
|
|
on RCA.CARRIER_ID = RC.CARRIER_ID
|
|
|
</if>
|
|
|
<where>
|
|
|
- <if test="orderStatus != null">
|
|
|
- OO.ORDER_STATUS = #{orderStatus}
|
|
|
- </if>
|
|
|
+ <choose>
|
|
|
+ <when test="orderStatus != 111">
|
|
|
+ and OO.ORDER_STATUS = #{orderStatus}
|
|
|
+ </when>
|
|
|
+ <when test="orderStatus == 111">
|
|
|
+ and OO.ORDER_STATUS in (0, 1, 2, 5)
|
|
|
+ </when>
|
|
|
+ </choose>
|
|
|
<if test="orderTypee != null">
|
|
|
and OO.ORDER_TYPE = #{orderTypee}
|
|
|
</if>
|