|
|
@@ -25,6 +25,7 @@
|
|
|
AND t3.deleted = 0
|
|
|
and t1.ship_id = #{reqVO.shipId}
|
|
|
AND t1.route_id = #{reqVO.routeId}
|
|
|
+ and t1.start_time > now()
|
|
|
and t1.channel like '%2%'
|
|
|
<if test="reqVO.startDate != null and reqVO.startDate != ''">
|
|
|
AND t1.start_time >= #{reqVO.startDate}
|
|
|
@@ -32,6 +33,8 @@
|
|
|
<if test="reqVO.endDate != null and reqVO.endDate != ''">
|
|
|
AND t1.start_time <= CONCAT(#{reqVO.endDate},' 23:59:59')
|
|
|
</if>
|
|
|
+ GROUP BY
|
|
|
+ t1.id
|
|
|
|
|
|
</select>
|
|
|
<select id="selectRoomModelListByVoyageId"
|