公务用车 分页

project-zcustom/src/main/java/com/project/zcustom/controller/officalCar/PlatCarController.java

@@ -33,8 +33,8 @@ public class PlatCarController {
      * 2025年度公务车车辆明细
      */
     @GetMapping("/carDetail")
-    public AjaxResult getCarDetail(@RequestParam String appOrg, @RequestParam Long flag) {
-        return AjaxResult.success("查询成功", largePlatCarService.getCarDetail(appOrg, flag));
+    public AjaxResult getCarDetail(@RequestParam String appOrg, @RequestParam Long flag, @RequestParam Long pageSize, @RequestParam Long page) {
+        return AjaxResult.success("查询成功", largePlatCarService.getCarDetail(appOrg, flag, pageSize, page));
     }
 
     /**
@@ -49,8 +49,8 @@ public class PlatCarController {
      * 公务车预警明细
      */
     @GetMapping("/warnDetail")
-    public AjaxResult getWarnDetail(@RequestParam String appOrg, @RequestParam String alertType) {
-        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg, alertType));
+    public AjaxResult getWarnDetail(@RequestParam String appOrg, @RequestParam String alertType, @RequestParam Long pageSize, @RequestParam Long page) {
+        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg, alertType, pageSize, page));
     }
 
     /**

project-zcustom/src/main/java/com/project/zcustom/mapper/car/PlatCarMapper.java

@@ -12,11 +12,15 @@ public interface PlatCarMapper {
 
     LargeCar getResourceNumber(String appOrg);
 
-    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+    List<LargeCarDetail> getCarDetail(String appOrg, Long flag, Long pageSize, Long page);
+
+    int getCarDetailNum(String appOrg, Long flag);
 
     LargeCar getMonitorNumber(String appOrg);
 
-    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType);
+    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType, Long pageSize, Long page);
+
+    int getWarnDetailNum(String appOrg, String alertType);
 
     LargeCar getOperationManageTopHalf(String appOrg);
 

project-zcustom/src/main/java/com/project/zcustom/service/car/ILargePlatCarService.java

@@ -3,15 +3,16 @@ package com.project.zcustom.service.car;
 import com.project.zcustom.domain.addional.LargeCar;
 import com.project.zcustom.domain.addional.LargeCarDetail;
 import com.project.zcustom.domain.addional.LargeWarnDetail;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
 
 public interface ILargePlatCarService {
     LargeCar getResource(String appOrg);
-    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+    Map<String, Object> getCarDetail(String appOrg, Long flag, Long pageSize, Long page);
     LargeCar getMonitor(String appOrg);
-    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType);
+    Map<String, Object> getWarnDetail(String appOrg, String alertType, Long pageSize, Long page);
     LargeCar getOperationManageTopHalf(String appOrg);
     Map<String, Object> getOperationManageLastHalf();
     List<Long> getSelfCarNum();

project-zcustom/src/main/java/com/project/zcustom/service/car/Impl/LargePlatCarServiceImpl.java

@@ -39,8 +39,11 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
         return largeCar;
     }
 
-    public List<LargeCarDetail> getCarDetail(String appOrg, Long flag){
-        return platCarMapper.getCarDetail(appOrg, flag);
+    public Map<String, Object> getCarDetail(String appOrg, Long flag, Long pageSize, Long page){
+        Map<String, Object> map = new HashMap<>();
+        map.put("list", platCarMapper.getCarDetail(appOrg, flag, pageSize, page * pageSize));
+        map.put("total", platCarMapper.getCarDetailNum(appOrg, flag));
+        return map;
     }
 
     public LargeCar getMonitor(String appOrg){
@@ -59,8 +62,11 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
         return largeCar;
     }
 
-    public List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType){
-        return platCarMapper.getWarnDetail(appOrg, alertType);
+    public Map<String, Object> getWarnDetail(String appOrg, String alertType, Long pageSize, Long page){
+        Map<String, Object> map = new HashMap<>();
+        map.put("list", platCarMapper.getWarnDetail(appOrg, alertType, pageSize, page * pageSize));
+        map.put("total", platCarMapper.getWarnDetailNum(appOrg, alertType));
+        return map;
     }
 
     public LargeCar getOperationManageTopHalf(String appOrg){

project-zcustom/src/main/resources/mapper/zcustom/car/PlatCarMapper.xml

@@ -103,7 +103,20 @@
             large_plat_public_car_change_detail a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         WHERE
-            b.app_org = #{arg0} AND flag = #{arg1}
+            flag = #{arg1}
+        <if test="arg0 != '10001'">AND b.app_org = #{arg0}</if>
+            LIMIT #{arg2} OFFSET #{arg3}
+    </select>
+
+    <select id="getCarDetailNum" resultType="int">
+        SELECT
+            count(1)
+        FROM
+            large_plat_public_car_change_detail a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            flag = #{arg1}
+        <if test="arg0 != '10001'">AND b.app_org = #{arg0}</if>
     </select>
 
     <select id="getMonitorNumber" parameterType="String" resultMap="LargePlatPublicCarResult">
@@ -135,7 +148,20 @@
             large_plat_public_car_warn_detail a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         WHERE
-            b.app_org = #{arg0} AND alert_type = #{arg1}
+            alert_type = #{arg1}
+        <if test="arg0 != '10001'">AND b.app_org = #{arg0}</if>
+            LIMIT #{arg2} OFFSET #{arg3}
+    </select>
+
+    <select id="getWarnDetailNum" resultType="int">
+        SELECT
+        count(1)
+        FROM
+        large_plat_public_car_warn_detail a
+        LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+        alert_type = #{arg1}
+        <if test="arg0 != '10001'">AND b.app_org = #{arg0}</if>
     </select>
 
     <select id="getOperationManageTopHalf" parameterType="String" resultMap="LargePlatPublicCarResult">