'提交'

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -233,7 +233,11 @@
             <if test="remark!=null and remark!=''">
                 AND REGEXP_LIKE("remark", #{remark})
             </if>
+            <if test="lastIndex!=null">
+                and "operationsNameId" &lt; #{lastIndex}
+            </if>
         </where>
+        order by "operationsNameId" desc
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -375,12 +379,14 @@
             </if>
             <if test="lastIndex!=null">
                 and "personnelId" &lt; #{lastIndex}
-                order by "personnelId" desc
             </if>
         </where>
         <if test="capacityId!=null and capacityId!=''">
             ORDER BY "countNumber" DESC
         </if>
+        <if test="!(capacityId!=null and capacityId!='')">
+            order by "personnelId" desc
+        </if>
         FETCH NEXT 10 ROWS ONLY
     )
     <if test="id!=null and id.size>0">
@@ -501,12 +507,13 @@
 
             <if test="lastIndex!=null">
                 and RCA.CAPACITY_ID &lt; #{lastIndex}
-                order by RCA.CAPACITY_ID desc
             </if>
-
             <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
                 ORDER BY "countNumber" DESC
             </if>
+            <if test="!((driverId!=null and driverId!='') or (driverId2!=null and driverId2!=''))">
+                order by RCA.CAPACITY_ID desc
+            </if>
 
             FETCH NEXT 10 ROWS ONLY
         )
@@ -750,7 +757,11 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="lastIndex!=null">
+                and "transrangeId" &lt; #{lastIndex}
+            </if>
         </where>
+        order by "transrangeId" desc
         FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getCategoryCodeByLike" resultType="java.util.Map">
@@ -810,8 +821,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="lastIndex!=null">
+                and RCT.CAPACITY_TYPE_ID &lt; #{lastIndex}
+            </if>
         </where>
-        GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
+        GROUP BY RCT.CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
+        ORDER BY RCT.CAPACITY_TYPE_ID desc
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">