|
@@ -45,7 +45,7 @@
|
|
|
<if test="vo.signStatus != null and vo.signStatus == 0">
|
|
<if test="vo.signStatus != null and vo.signStatus == 0">
|
|
|
and d.sign_time is null
|
|
and d.sign_time is null
|
|
|
</if>
|
|
</if>
|
|
|
- order by d.address asc, d.arrive_time asc
|
|
|
|
|
|
|
+ order by d.address + 0 asc, d.arrive_time + 0 asc
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<!-- selectVisitorExportList: 导出游客接站明细，条件与selectPage2一致，不分页 -->
|
|
<!-- selectVisitorExportList: 导出游客接站明细，条件与selectPage2一致，不分页 -->
|
|
@@ -84,7 +84,7 @@
|
|
|
<if test="vo.signStatus != null and vo.signStatus == 0">
|
|
<if test="vo.signStatus != null and vo.signStatus == 0">
|
|
|
and d.sign_time is null
|
|
and d.sign_time is null
|
|
|
</if>
|
|
</if>
|
|
|
- order by d.address asc, d.arrive_time asc
|
|
|
|
|
|
|
+ order by d.address + 0 asc, d.arrive_time + 0 asc
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="selectPage3" resultType="map">
|
|
<select id="selectPage3" resultType="map">
|
|
@@ -152,7 +152,7 @@
|
|
|
<if test="vo.otaId != null and vo.otaId != ''">
|
|
<if test="vo.otaId != null and vo.otaId != ''">
|
|
|
and o.source_id = #{vo.otaId}
|
|
and o.source_id = #{vo.otaId}
|
|
|
</if>
|
|
</if>
|
|
|
- order by d.address asc, d.arrive_time asc
|
|
|
|
|
|
|
+ order by d.address + 0 asc, d.arrive_time + 0 asc
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<!-- 赠送行程导出查询：条件与selectGiftPage一致，不分页 -->
|
|
<!-- 赠送行程导出查询：条件与selectGiftPage一致，不分页 -->
|
|
@@ -197,7 +197,7 @@
|
|
|
<if test="vo.otaId != null and vo.otaId != ''">
|
|
<if test="vo.otaId != null and vo.otaId != ''">
|
|
|
and o.source_id = #{vo.otaId}
|
|
and o.source_id = #{vo.otaId}
|
|
|
</if>
|
|
</if>
|
|
|
- order by d.address asc, d.arrive_time asc
|
|
|
|
|
|
|
+ order by d.address + 0 asc, d.arrive_time + 0 asc
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<!-- 赠送行程补登订单查询：根据订单号/证件号后4位搜索，关联trade_detail过滤product_id -->
|
|
<!-- 赠送行程补登订单查询：根据订单号/证件号后4位搜索，关联trade_detail过滤product_id -->
|
