|
@@ -262,17 +262,10 @@
|
|
|
LEFT JOIN ota_distributor od on od.id = tor.source_id
|
|
LEFT JOIN ota_distributor od on od.id = tor.source_id
|
|
|
LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0
|
|
LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0
|
|
|
WHERE tv.deleted = 0
|
|
WHERE tv.deleted = 0
|
|
|
- <choose>
|
|
|
|
|
- <when test="vo.orderNoList != null and vo.orderNoList.size() > 0">
|
|
|
|
|
- AND tor.order_no IN
|
|
|
|
|
- <foreach collection="vo.orderNoList" item="item" separator="," open="(" close=")">
|
|
|
|
|
- #{item}
|
|
|
|
|
- </foreach>
|
|
|
|
|
- </when>
|
|
|
|
|
- <when test="vo.orderNo != null and vo.orderNo != ''">
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <if test="vo.orderNo != null and vo.orderNo != ''">
|
|
|
AND tor.order_no = #{vo.orderNo}
|
|
AND tor.order_no = #{vo.orderNo}
|
|
|
- </when>
|
|
|
|
|
- </choose>
|
|
|
|
|
|
|
+ </if>
|
|
|
<if test="vo.voyageId != null and vo.voyageId != ''">
|
|
<if test="vo.voyageId != null and vo.voyageId != ''">
|
|
|
AND tor.voyage_id = #{vo.voyageId}
|
|
AND tor.voyage_id = #{vo.voyageId}
|
|
|
</if>
|
|
</if>
|