|
|
@@ -373,6 +373,10 @@
|
|
|
<if test="index!=null and index!=''">
|
|
|
AND REGEXP_LIKE("label", #{index})
|
|
|
</if>
|
|
|
+ <if test="lastIndex!=null">
|
|
|
+ and "personnelId" < #{lastIndex}
|
|
|
+ order by "personnelId" desc
|
|
|
+ </if>
|
|
|
</where>
|
|
|
<if test="capacityId!=null and capacityId!=''">
|
|
|
ORDER BY "countNumber" DESC
|
|
|
@@ -494,9 +498,16 @@
|
|
|
<if test="capacityId!=null and capacityId!=''">
|
|
|
AND RCA .CAPACITY_ID = #{capacityId}
|
|
|
</if>
|
|
|
+
|
|
|
+ <if test="lastIndex!=null">
|
|
|
+ and RCA.CAPACITY_ID < #{lastIndex}
|
|
|
+ order by RCA.CAPACITY_ID desc
|
|
|
+ </if>
|
|
|
+
|
|
|
<if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
|
|
|
ORDER BY "countNumber" DESC
|
|
|
</if>
|
|
|
+
|
|
|
FETCH NEXT 10 ROWS ONLY
|
|
|
)
|
|
|
<if test="id!=null and id.size>0">
|