|
@@ -35,7 +35,7 @@
|
|
and a.demand_uuid = #{demandUuid}
|
|
and a.demand_uuid = #{demandUuid}
|
|
</if>
|
|
</if>
|
|
and a.state_type = '1'
|
|
and a.state_type = '1'
|
|
- and a.id not in (select top ${page} id from bus_travel where code = #{code}) order by a.id
|
|
|
|
|
|
+ and a.id not in (select top ${page} id from bus_travel where code = #{code} and state_type = '1' ORDER BY id) order by a.id
|
|
</trim>
|
|
</trim>
|
|
</select>
|
|
</select>
|
|
<!-- 查询游记列表内容 -->
|
|
<!-- 查询游记列表内容 -->
|
|
@@ -125,6 +125,7 @@
|
|
<if test="jdrq != null and jdrq != ''">
|
|
<if test="jdrq != null and jdrq != ''">
|
|
and #{startTime} <![CDATA[ <= ]]> a.jdrq and #{endTime} <![CDATA[ > ]]> jdrq
|
|
and #{startTime} <![CDATA[ <= ]]> a.jdrq and #{endTime} <![CDATA[ > ]]> jdrq
|
|
</if>
|
|
</if>
|
|
|
|
+ and state_type = '1'
|
|
</trim>
|
|
</trim>
|
|
) e
|
|
) e
|
|
where
|
|
where
|
|
@@ -143,6 +144,7 @@
|
|
<if test="jdrq != null and jdrq != ''">
|
|
<if test="jdrq != null and jdrq != ''">
|
|
and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
|
|
and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
|
|
</if>
|
|
</if>
|
|
|
|
+ and state_type = '1'
|
|
</trim>
|
|
</trim>
|
|
UNION ALL
|
|
UNION ALL
|
|
select
|
|
select
|
|
@@ -158,6 +160,7 @@
|
|
<if test="jdrq != null and jdrq != ''">
|
|
<if test="jdrq != null and jdrq != ''">
|
|
and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
|
|
and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
|
|
</if>
|
|
</if>
|
|
|
|
+ and state_type = '1'
|
|
</trim>
|
|
</trim>
|
|
) f ORDER BY f.jdrq desc)
|
|
) f ORDER BY f.jdrq desc)
|
|
ORDER BY
|
|
ORDER BY
|