排序

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjAdministrativePunishMapper.xml

@@ -76,7 +76,7 @@
         <if test="bo.startDecisionDate != null and bo.endDecisionDate != null">
             and declare_date between #{bo.startDecisionDate} and #{bo.endDecisionDate}
         </if>
-        order by case_no,
+        order by report_flag, administrative_punish_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjBuildCheckMapper.xml

@@ -63,7 +63,7 @@
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>
-        order by build_check_id,
+        order by report_flag, build_check_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjLocaleSecurityCheckMapper.xml

@@ -51,7 +51,7 @@
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>
-        order by locale_security_check_id,
+        order by report_flag, locale_security_check_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjPortReportMapper.xml

@@ -66,7 +66,7 @@
         <if test="bo.startReleaseDate != null and bo.endReleaseDate != null">
             and release_date between #{bo.startReleaseDate} and #{bo.endReleaseDate}
         </if>
-        order by port_report_id,
+        order by report_flag, port_report_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjSecurityCheckMapper.xml

@@ -94,7 +94,7 @@
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>
-        order by ship_id,
+        order by report_flag, ship_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjServiceCheckMapper.xml

@@ -55,7 +55,7 @@
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>
-        order by service_check_id,
+        order by report_flag, service_check_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjShipRegistrationMapper.xml

@@ -60,7 +60,7 @@
         <if test="bo.startDeletionDate != null and bo.endDeletionDate != null">
             and deletion_date between #{bo.startDeletionDate} and #{bo.endDeletionDate}
         </if>
-        order by ship_id,
+        order by report_flag, ship_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipCompanyMapper.xml

@@ -55,7 +55,7 @@
         <if test="bo.startReleaseDate != null and bo.endReleaseDate != null">
             and release_date between #{bo.startReleaseDate} and #{bo.endReleaseDate}
         </if>
-        order by track_ship_company_id,
+        order by report_flag, track_ship_company_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipsMapper.xml

@@ -81,7 +81,7 @@
         <if test="bo.startTraceDate != null and bo.endTraceDate != null">
             and trace_date between #{bo.startTraceDate} and #{bo.endTraceDate}
         </if>
-        order by track_ships_id,
+        order by report_flag, track_ships_id,
                  RANDOM()
     </select>
 </mapper>