|
|
@@ -34,11 +34,12 @@
|
|
|
order by d.address asc, d.arrive_time asc, d.batch_no asc
|
|
|
</select>
|
|
|
<select id="selectPage3" resultType="map">
|
|
|
- select distinct o.id, o.order_no, r.direction , v.name, v.credential_no, v.mobile
|
|
|
+ select distinct o.id, o.order_no, r.direction , v.name, v.credential_no, v.mobile, rm.name AS room_model_name
|
|
|
from trade_order o
|
|
|
inner join product_voyage p on o.voyage_id = p.id
|
|
|
inner join resource_route r on p.route_id = r.id
|
|
|
inner join trade_visitor v on o.id = v.order_id
|
|
|
+ inner join resource_room_model rm ON v.room_model_id = rm.id
|
|
|
where o.deleted = 0 and p.deleted = 0 and r.deleted = 0 and v.deleted = 0
|
|
|
and o.voyage_id = #{vo.voyageId}
|
|
|
<if test="vo.queryCode != null">
|