|
@@ -472,6 +472,7 @@
|
|
|
<if test="sortType == 1">
|
|
<if test="sortType == 1">
|
|
|
desc
|
|
desc
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ ,a.`number`
|
|
|
<if test="page_sql != null">
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|
|
@@ -649,7 +650,7 @@
|
|
|
<if test="area != null">
|
|
<if test="area != null">
|
|
|
and b.location_area = #{area,jdbcType=INTEGER}
|
|
and b.location_area = #{area,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
- order by a.transfer_time desc
|
|
|
|
|
|
|
+ order by a.transfer_time desc,a.`number`
|
|
|
<if test="page_sql != null">
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|
|
@@ -2166,7 +2167,7 @@ inner join(
|
|
|
<if test="startTime!=null and endTime !=null">
|
|
<if test="startTime!=null and endTime !=null">
|
|
|
and a.create_time between #{startTime} and #{endTime}
|
|
and a.create_time between #{startTime} and #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
- order by a.status ,a.create_time desc
|
|
|
|
|
|
|
+ order by a.status ,a.create_time desc,a.id
|
|
|
<if test="page_sql != null">
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|