|
|
@@ -32,19 +32,19 @@
|
|
|
<if test="reqVO.routeId != null and reqVO.routeId != ''">
|
|
|
AND t1.route_id = #{reqVO.routeId}
|
|
|
</if>
|
|
|
- and t1.border_time > now()
|
|
|
+ and t1.boarding_time > now()
|
|
|
and t1.channel like '%2%'
|
|
|
and t4.can_sale = 1
|
|
|
<if test="reqVO.startDate != null and reqVO.startDate != ''">
|
|
|
- AND t1.border_time >= #{reqVO.startDate}
|
|
|
+ AND t1.boarding_time >= #{reqVO.startDate}
|
|
|
</if>
|
|
|
<if test="reqVO.endDate != null and reqVO.endDate != ''">
|
|
|
- AND t1.border_time <= CONCAT(#{reqVO.endDate},' 23:59:59')
|
|
|
+ AND t1.boarding_time <= CONCAT(#{reqVO.endDate},' 23:59:59')
|
|
|
</if>
|
|
|
GROUP BY
|
|
|
t1.id
|
|
|
order by
|
|
|
- t1.border_time ASC
|
|
|
+ t1.boarding_time ASC
|
|
|
|
|
|
</select>
|
|
|
<select id="selectRoomModelListByVoyageId"
|