jx-更换分页

dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseAppletController.java

@@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.appBase.controller;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse;
 import cn.iocoder.yudao.module.jx.service.DrivePayService;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +37,7 @@ public class DriveSchoolCourseAppletController extends BaseController
     @GetMapping("/limtList")
     public CommonResult limtList(DriveSchoolCourse driveSchoolCourse)
     {
-        List<DriveSchoolCourse> list = driveSchoolCourseService.selectDriveSchoolCourseAppletList(driveSchoolCourse);
+        List<DriveSchoolCourse> list = driveSchoolCourseService.selectDriveSchoolCourseAppletListAll(driveSchoolCourse);
         if (CollectionUtils.isNotEmpty(list)){
             if (list.size()>3){
                 list.subList(0,3);
@@ -54,11 +55,12 @@ public class DriveSchoolCourseAppletController extends BaseController
      * 查询驾校课程分类列表（全部）
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCourse driveSchoolCourse)
+    public CommonResult<IPage<?>> list(DriveSchoolCourse driveSchoolCourse)
     {
-        startPage();
+        Page<DriveSchoolCourse> page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize());
-        List<DriveSchoolCourse> list = driveSchoolCourseService.selectDriveSchoolCourseAppletList(driveSchoolCourse);
+        IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseAppList(driveSchoolCourse, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolCourseIPage);
+        //return getDataTable(list);
     }
 
     /**

dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCourseOrderAppletController.java

@@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.appBase.controller;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseOrderService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 驾照报名订单Controller
  *
@@ -27,11 +26,12 @@ public class DriveSchoolCourseOrderAppletController extends BaseController
      * 查询驾照报名订单列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCourseOrder driveSchoolCourseOrder)
+    public CommonResult<IPage<?>> list(DriveSchoolCourseOrder driveSchoolCourseOrder)
     {
-        startPage();
+        Page<DriveSchoolCourseOrder> page = new Page<>(driveSchoolCourseOrder.getPageNum(), driveSchoolCourseOrder.getPageSize());
-        List<DriveSchoolCourseOrder> list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder);
+        IPage<DriveSchoolCourseOrder> driveSchoolCourseOrderIPage = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolCourseOrderIPage);
+        //return getDataTable(list);
     }
 
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolInfoAppletController.java

@@ -2,9 +2,10 @@ package cn.iocoder.yudao.module.appBase.controller;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -28,10 +29,11 @@ public class DriveSchoolInfoAppletController extends BaseController
      * 查询驾校信息列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolInfo driveSchoolInfo)
+    public CommonResult<IPage<?>> list(DriveSchoolInfo driveSchoolInfo)
     {
-        startPage();
+        Page<DriveSchoolInfo> page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize());
-        return driveSchoolInfoService.selectDriveSchoolInfoAppletList(driveSchoolInfo);
+        IPage<DriveSchoolInfo> driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoAppletList(driveSchoolInfo, page);
+        return success(driveSchoolInfoIPage);
     }
 
     /**

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveCarBindController.java

@@ -2,19 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveCarBind;
 import cn.iocoder.yudao.module.jx.service.IDriveCarBindService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 车辆绑定（教练）Controller
  *
@@ -32,23 +26,24 @@ public class DriveCarBindController extends BaseController
      * 查询车辆绑定（教练）列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveCarBind driveCarBind)
+    public CommonResult<IPage<?>> list(DriveCarBind driveCarBind)
     {
-        startPage();
+        Page<DriveCarBind> page = new Page<>(driveCarBind.getPageNum(), driveCarBind.getPageSize());
-        List<DriveCarBind> list = driveCarBindService.selectDriveCarBindList(driveCarBind);
+        IPage<DriveCarBind> driveCarBindIPage = driveCarBindService.selectDriveCarBindList(driveCarBind, page);
-        return getDataTable(list);
+        return CommonResult.success(driveCarBindIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出车辆绑定（教练）列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveCarBind driveCarBind)
+//    public void export(HttpServletResponse response, DriveCarBind driveCarBind)
-    {
+//    {
-        List<DriveCarBind> list = driveCarBindService.selectDriveCarBindList(driveCarBind);
+//        List<DriveCarBind> list = driveCarBindService.selectDriveCarBindList(driveCarBind);
-        ExcelUtil<DriveCarBind> util = new ExcelUtil<DriveCarBind>(DriveCarBind.class);
+//        ExcelUtil<DriveCarBind> util = new ExcelUtil<DriveCarBind>(DriveCarBind.class);
-        util.exportExcel(response, list, "车辆绑定（教练）数据");
+//        util.exportExcel(response, list, "车辆绑定（教练）数据");
-    }
+//    }
 
     /**
      * 获取车辆绑定（教练）详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveContractTestController.java

@@ -2,12 +2,11 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveContractTest;
 import cn.iocoder.yudao.module.jx.service.IDriveContractTestService;
 import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.extern.java.Log;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,23 +30,24 @@ public class DriveContractTestController extends BaseController
      * 查询合同模板列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveContractTest driveContractTest)
+    public CommonResult<IPage<?>> list(DriveContractTest driveContractTest)
     {
-        startPage();
+        Page<DriveContractTest> page = new Page<>(driveContractTest.getPageNum(), driveContractTest.getPageSize());
-        List<DriveContractTest> list = driveContractTestService.selectDriveContractTestList(driveContractTest);
+        IPage<DriveContractTest> driveContractTestIPage = driveContractTestService.selectDriveContractTestList(driveContractTest, page);
-        return getDataTable(list);
+        return CommonResult.success(driveContractTestIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出合同模板列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveContractTest driveContractTest)
+//    public void export(HttpServletResponse response, DriveContractTest driveContractTest)
-    {
+//    {
-        List<DriveContractTest> list = driveContractTestService.selectDriveContractTestList(driveContractTest);
+//        List<DriveContractTest> list = driveContractTestService.selectDriveContractTestList(driveContractTest);
-        ExcelUtil<DriveContractTest> util = new ExcelUtil<DriveContractTest>(DriveContractTest.class);
+//        ExcelUtil<DriveContractTest> util = new ExcelUtil<DriveContractTest>(DriveContractTest.class);
-        util.exportExcel(response, list, "合同模板数据");
+//        util.exportExcel(response, list, "合同模板数据");
-    }
+//    }
 
     /**
      * 获取合同模板详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolBookingController.java

@@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
+import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal;
 import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolBooking;
 import cn.iocoder.yudao.module.jx.service.DriveSchoolBookingService;
 import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.extern.java.Log;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,11 +31,12 @@ public class DriveSchoolBookingController extends BaseController
      * 查询预约列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolBooking driveSchoolBooking)
+    public CommonResult<IPage<?>> list(DriveSchoolBooking driveSchoolBooking)
     {
-        startPage();
+        Page<DriveSchoolBooking> page = new Page<>(driveSchoolBooking.getPageNum(), driveSchoolBooking.getPageSize());
-        List<DriveSchoolBooking> list = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking);
+        IPage<DriveSchoolBooking> driveSchoolBookingIPage = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking, page);
-        return getDataTable(list);
+        return success(driveSchoolBookingIPage);
+        //return getDataTable(list);
     }
     /**
      * 查询预约列表
@@ -51,13 +51,13 @@ public class DriveSchoolBookingController extends BaseController
     /**
      * 导出预约列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolBooking driveSchoolBooking)
+//    public void export(HttpServletResponse response, DriveSchoolBooking driveSchoolBooking)
-    {
+//    {
-        List<DriveSchoolBooking> list = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking);
+//        List<DriveSchoolBooking> list = driveSchoolBookingService.selectDriveSchoolBookingList(driveSchoolBooking);
-        ExcelUtil<DriveSchoolBooking> util = new ExcelUtil<DriveSchoolBooking>(DriveSchoolBooking.class);
+//        ExcelUtil<DriveSchoolBooking> util = new ExcelUtil<DriveSchoolBooking>(DriveSchoolBooking.class);
-        util.exportExcel(response, list, "预约数据");
+//        util.exportExcel(response, list, "预约数据");
-    }
+//    }
 
     /**
      * 获取预约详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarController.java

@@ -3,14 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCarService;
 import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.extern.java.Log;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -39,11 +38,12 @@ public class DriveSchoolCarController extends BaseController
      * 查询车辆信息列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCar driveSchoolCar)
+    public CommonResult<IPage<?>> list(DriveSchoolCar driveSchoolCar)
     {
-        startPage();
+        Page<DriveSchoolCar> page = new Page<>(driveSchoolCar.getPageNum(), driveSchoolCar.getPageSize());
-        List<DriveSchoolCar> list = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar);
+        IPage<DriveSchoolCar> driveSchoolCarIPage = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolCarIPage);
+        //return getDataTable(list);
     }
 
     /**
@@ -52,7 +52,7 @@ public class DriveSchoolCarController extends BaseController
     @GetMapping("/listAll")
     public CommonResult listAll(DriveSchoolCar driveSchoolCar)
     {
-        List<DriveSchoolCar> list = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar);
+        List<DriveSchoolCar> list = driveSchoolCarService.selectDriveSchoolCarListAll(driveSchoolCar);
         return CommonResult.success(list);
     }
 
@@ -62,7 +62,7 @@ public class DriveSchoolCarController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, DriveSchoolCar driveSchoolCar)
     {
-        List<DriveSchoolCar> list = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar);
+        List<DriveSchoolCar> list = driveSchoolCarService.selectDriveSchoolCarListAll(driveSchoolCar);
         ExcelUtil<DriveSchoolCar> util = new ExcelUtil<DriveSchoolCar>(DriveSchoolCar.class);
         util.exportExcel(response, list, "车辆信息数据");
     }

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCarRepairController.java

@@ -2,12 +2,11 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCarRepair;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCarRepairService;
 import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.extern.java.Log;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,11 +30,12 @@ public class DriveSchoolCarRepairController extends BaseController
      * 查询车辆维修记录列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCarRepair driveSchoolCarRepair)
+    public CommonResult<IPage<?>> list(DriveSchoolCarRepair driveSchoolCarRepair)
     {
-        startPage();
+        Page<DriveSchoolCarRepair> page = new Page<>(driveSchoolCarRepair.getPageNum(), driveSchoolCarRepair.getPageSize());
-        List<DriveSchoolCarRepair> list = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair);
+        IPage<DriveSchoolCarRepair> driveSchoolCarRepairIPage = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolCarRepairIPage);
+        //return getDataTable(list);
     }
 
     /**
@@ -44,7 +44,7 @@ public class DriveSchoolCarRepairController extends BaseController
     @GetMapping("/listAll")
     public CommonResult listAll(DriveSchoolCarRepair driveSchoolCarRepair)
     {
-        List<DriveSchoolCarRepair> list = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair);
+        List<DriveSchoolCarRepair> list = driveSchoolCarRepairService.selectDriveSchoolCarRepairListAll(driveSchoolCarRepair);
         return CommonResult.success(list);
     }
 
@@ -54,7 +54,7 @@ public class DriveSchoolCarRepairController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, DriveSchoolCarRepair driveSchoolCarRepair)
     {
-        List<DriveSchoolCarRepair> list = driveSchoolCarRepairService.selectDriveSchoolCarRepairList(driveSchoolCarRepair);
+        List<DriveSchoolCarRepair> list = driveSchoolCarRepairService.selectDriveSchoolCarRepairListAll(driveSchoolCarRepair);
         ExcelUtil<DriveSchoolCarRepair> util = new ExcelUtil<DriveSchoolCarRepair>(DriveSchoolCarRepair.class);
         util.exportExcel(response, list, "车辆维修记录数据");
     }

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCheckController.java

@@ -2,18 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCheckService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 车检管理Controller
  *
@@ -31,23 +26,24 @@ public class DriveSchoolCheckController extends BaseController
      * 查询车检管理列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCheck driveSchoolCheck)
+    public CommonResult<IPage<?>> list(DriveSchoolCheck driveSchoolCheck)
     {
-        startPage();
+        Page<DriveSchoolCheck> page = new Page<>(driveSchoolCheck.getPageNum(), driveSchoolCheck.getPageSize());
-        List<DriveSchoolCheck> list = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck);
+        IPage<DriveSchoolCheck> driveSchoolCheckIPage = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck, page);
-        return getDataTable(list);
+        return success(driveSchoolCheckIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出车检管理列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolCheck driveSchoolCheck)
+//    public void export(HttpServletResponse response, DriveSchoolCheck driveSchoolCheck)
-    {
+//    {
-        List<DriveSchoolCheck> list = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck);
+//        List<DriveSchoolCheck> list = driveSchoolCheckService.selectDriveSchoolCheckList(driveSchoolCheck);
-        ExcelUtil<DriveSchoolCheck> util = new ExcelUtil<DriveSchoolCheck>(DriveSchoolCheck.class);
+//        ExcelUtil<DriveSchoolCheck> util = new ExcelUtil<DriveSchoolCheck>(DriveSchoolCheck.class);
-        util.exportExcel(response, list, "车检管理数据");
+//        util.exportExcel(response, list, "车检管理数据");
-    }
+//    }
 
     /**
      * 获取车检管理详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCoachController.java

@@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
 import cn.iocoder.yudao.module.jx.core.page.PageDomain;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.core.page.TableSupport;
 import cn.iocoder.yudao.module.jx.core.text.HttpStatus;
+import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCoachService;
 import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.extern.java.Log;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 /**
  * 驾校教练Controller
@@ -41,40 +40,43 @@ public class DriveSchoolCoachController extends BaseController
     /**
      * 查询驾校教练列表
      */
-   /* @GetMapping("/list")
+    @GetMapping("/list")
     public CommonResult list(DriveSchoolCoach driveSchoolCoach)
     {
-        List<DriveSchoolCoach> list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach);
+        List<DriveSchoolCoach> list = driveSchoolCoachService.selectDriveSchoolCoachListAll(driveSchoolCoach);
         return CommonResult.success(list);
-    }*/
-
-    @GetMapping("/list")
-    public TableDataInfo lists(DriveSchoolCoach driveSchoolCoach)
-    {
-        List<DriveSchoolCoach> list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach);
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = 20;
-
-        int num = 100;
-        list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.SUCCESS);
-        rspData.setRows(list);
-        rspData.setTotal(num);
-        return rspData;
     }
 
+//    @GetMapping("/list")
+//    public CommonResult<IPage<?>> lists(DriveSchoolCoach driveSchoolCoach)
+//    {
+//        Page<DriveSchoolCoach> page = new Page<>(driveSchoolCoach.getPageNum(), driveSchoolCoach.getPageSize());
+//
+//        IPage<DriveSchoolCoach> driveSchoolCoachIPage = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach, page);
+//        return CommonResult.success(driveSchoolCoachIPage);
+////        PageDomain pageDomain = TableSupport.buildPageRequest();
+////        Integer pageNum = pageDomain.getPageNum();
+////        Integer pageSize = 20;
+////
+////        int num = 100;
+////        list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+////        CommonResult<IPage<?>> rspData = new CommonResult<IPage<?>>();
+////        rspData.setCode(HttpStatus.SUCCESS);
+////        rspData.set(list);
+////        rspData.setTotal(num);
+////        return rspData;
+//    }
+
     /**
      * 导出驾校教练列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolCoach driveSchoolCoach)
+//    public void export(HttpServletResponse response, DriveSchoolCoach driveSchoolCoach)
-    {
+//    {
-        List<DriveSchoolCoach> list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach);
+//        List<DriveSchoolCoach> list = driveSchoolCoachService.selectDriveSchoolCoachList(driveSchoolCoach);
-        ExcelUtil<DriveSchoolCoach> util = new ExcelUtil<DriveSchoolCoach>(DriveSchoolCoach.class);
+//        ExcelUtil<DriveSchoolCoach> util = new ExcelUtil<DriveSchoolCoach>(DriveSchoolCoach.class);
-        util.exportExcel(response, list, "驾校教练数据");
+//        util.exportExcel(response, list, "驾校教练数据");
-    }
+//    }
 
     /**
      * 获取驾校教练详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java

@@ -2,18 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolContract;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolContractService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 驾校合同Controller
  *
@@ -31,23 +26,24 @@ public class DriveSchoolContractController extends BaseController
      * 查询驾校合同列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolContract driveSchoolContract)
+    public CommonResult<IPage<?>> list(DriveSchoolContract driveSchoolContract)
     {
-        startPage();
+        Page<DriveSchoolContract> page = new Page<>(driveSchoolContract.getPageNum(), driveSchoolContract.getPageSize());
-        List<DriveSchoolContract> list = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract);
+        IPage<DriveSchoolContract> driveSchoolContractIPage = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract, page);
-        return getDataTable(list);
+        return success(driveSchoolContractIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出驾校合同列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolContract driveSchoolContract)
+//    public void export(HttpServletResponse response, DriveSchoolContract driveSchoolContract)
-    {
+//    {
-        List<DriveSchoolContract> list = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract);
+//        List<DriveSchoolContract> list = driveSchoolContractService.selectDriveSchoolContractList(driveSchoolContract);
-        ExcelUtil<DriveSchoolContract> util = new ExcelUtil<DriveSchoolContract>(DriveSchoolContract.class);
+//        ExcelUtil<DriveSchoolContract> util = new ExcelUtil<DriveSchoolContract>(DriveSchoolContract.class);
-        util.exportExcel(response, list, "驾校合同数据");
+//        util.exportExcel(response, list, "驾校合同数据");
-    }
+//    }
 
     /**
      * 获取驾校合同详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java

@@ -2,18 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wechat.pay.java.service.payrollcard.model.BusinessType;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 驾校课程分类Controller
  *
@@ -31,11 +26,12 @@ public class DriveSchoolCourseController extends BaseController
      * 查询驾校课程分类列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCourse driveSchoolCourse)
+    public CommonResult<IPage<?>> list(DriveSchoolCourse driveSchoolCourse)
     {
-        startPage();
+        Page<DriveSchoolCourse> page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize());
-        List<DriveSchoolCourse> list = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse);
+        IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolCourseIPage);
+        //return getDataTable(list);
     }
 
     /**
@@ -51,13 +47,13 @@ public class DriveSchoolCourseController extends BaseController
     /**
      * 导出驾校课程分类列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolCourse driveSchoolCourse)
+//    public void export(HttpServletResponse response, DriveSchoolCourse driveSchoolCourse)
-    {
+//    {
-        List<DriveSchoolCourse> list = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse);
+//        List<DriveSchoolCourse> list = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse);
-        ExcelUtil<DriveSchoolCourse> util = new ExcelUtil<DriveSchoolCourse>(DriveSchoolCourse.class);
+//        ExcelUtil<DriveSchoolCourse> util = new ExcelUtil<DriveSchoolCourse>(DriveSchoolCourse.class);
-        util.exportExcel(response, list, "驾校课程分类数据");
+//        util.exportExcel(response, list, "驾校课程分类数据");
-    }
+//    }
 
     /**
      * 获取驾校课程分类详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseOrderController.java

@@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCourseOrderService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 驾照报名订单Controller
  *
@@ -30,24 +27,25 @@ public class DriveSchoolCourseOrderController extends BaseController
      * 查询驾照报名订单列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCourseOrder driveSchoolCourseOrder)
+    public CommonResult<IPage<?>> list(DriveSchoolCourseOrder driveSchoolCourseOrder)
     {
-        startPage();
+        Page<DriveSchoolCourseOrder> page = new Page<>(driveSchoolCourseOrder.getPageNum(), driveSchoolCourseOrder.getPageSize());
-        List<DriveSchoolCourseOrder> list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder);
+        IPage<DriveSchoolCourseOrder> driveSchoolCourseOrderIPage = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder, page);
-        return getDataTable(list);
+        return success(driveSchoolCourseOrderIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出驾照报名订单列表
      */
     //@Log(title = "驾照报名订单", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolCourseOrder driveSchoolCourseOrder)
+//    public void export(HttpServletResponse response, DriveSchoolCourseOrder driveSchoolCourseOrder)
-    {
+//    {
-        List<DriveSchoolCourseOrder> list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder);
+//        List<DriveSchoolCourseOrder> list = driveSchoolCourseOrderService.selectDriveSchoolCourseOrderList(driveSchoolCourseOrder);
-        ExcelUtil<DriveSchoolCourseOrder> util = new ExcelUtil<DriveSchoolCourseOrder>(DriveSchoolCourseOrder.class);
+//        ExcelUtil<DriveSchoolCourseOrder> util = new ExcelUtil<DriveSchoolCourseOrder>(DriveSchoolCourseOrder.class);
-        util.exportExcel(response, list, "驾照报名订单数据");
+//        util.exportExcel(response, list, "驾照报名订单数据");
-    }
+//    }
 
     /**
      * 获取驾照报名订单详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCredentialsController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCredentials;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolCredentialsService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 驾校资质信息Controller
  *
@@ -29,24 +26,25 @@ public class DriveSchoolCredentialsController extends BaseController
      * 查询驾校资质信息列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolCredentials driveSchoolCredentials)
+    public CommonResult<IPage<?>> list(DriveSchoolCredentials driveSchoolCredentials)
     {
-        startPage();
+        Page<DriveSchoolCredentials> page = new Page<>(driveSchoolCredentials.getPageNum(), driveSchoolCredentials.getPageSize());
-        List<DriveSchoolCredentials> list = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials);
+        IPage<DriveSchoolCredentials> driveSchoolCredentialsIPage = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials, page);
-        return getDataTable(list);
+        return success(driveSchoolCredentialsIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出驾校资质信息列表
      */
     //@Log(title = "驾校资质信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolCredentials driveSchoolCredentials)
+//    public void export(HttpServletResponse response, DriveSchoolCredentials driveSchoolCredentials)
-    {
+//    {
-        List<DriveSchoolCredentials> list = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials);
+//        List<DriveSchoolCredentials> list = driveSchoolCredentialsService.selectDriveSchoolCredentialsList(driveSchoolCredentials);
-        ExcelUtil<DriveSchoolCredentials> util = new ExcelUtil<DriveSchoolCredentials>(DriveSchoolCredentials.class);
+//        ExcelUtil<DriveSchoolCredentials> util = new ExcelUtil<DriveSchoolCredentials>(DriveSchoolCredentials.class);
-        util.exportExcel(response, list, "驾校资质信息数据");
+//        util.exportExcel(response, list, "驾校资质信息数据");
-    }
+//    }
 
     /**
      * 获取驾校资质信息详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDailyManagementController.java

@@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDailyManagement;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolDailyManagementService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 驾校日常管理Controller
  *
@@ -30,24 +27,25 @@ public class DriveSchoolDailyManagementController extends BaseController
      * 查询驾校日常管理列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolDailyManagement driveSchoolDailyManagement)
+    public CommonResult<IPage<?>> list(DriveSchoolDailyManagement driveSchoolDailyManagement)
     {
-        startPage();
+        Page<DriveSchoolDailyManagement> page = new Page<>(driveSchoolDailyManagement.getPageNum(), driveSchoolDailyManagement.getPageSize());
-        List<DriveSchoolDailyManagement> list = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement);
+        IPage<DriveSchoolDailyManagement> driveSchoolDailyManagementIPage = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement, page);
-        return getDataTable(list);
+        return success(driveSchoolDailyManagementIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出驾校日常管理列表
      */
     //@Log(title = "驾校日常管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolDailyManagement driveSchoolDailyManagement)
+//    public void export(HttpServletResponse response, DriveSchoolDailyManagement driveSchoolDailyManagement)
-    {
+//    {
-        List<DriveSchoolDailyManagement> list = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement);
+//        List<DriveSchoolDailyManagement> list = driveSchoolDailyManagementService.selectDriveSchoolDailyManagementList(driveSchoolDailyManagement);
-        ExcelUtil<DriveSchoolDailyManagement> util = new ExcelUtil<DriveSchoolDailyManagement>(DriveSchoolDailyManagement.class);
+//        ExcelUtil<DriveSchoolDailyManagement> util = new ExcelUtil<DriveSchoolDailyManagement>(DriveSchoolDailyManagement.class);
-        util.exportExcel(response, list, "驾校日常管理数据");
+//        util.exportExcel(response, list, "驾校日常管理数据");
-    }
+//    }
 
     /**
      * 获取驾校日常管理详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDeductController.java

@@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDeduct;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolDeductService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 提成配置Controller
  *
@@ -30,24 +27,25 @@ public class DriveSchoolDeductController extends BaseController
      * 查询提成配置列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolDeduct driveSchoolDeduct)
+    public CommonResult<IPage<?>> list(DriveSchoolDeduct driveSchoolDeduct)
     {
-        startPage();
+        Page<DriveSchoolDeduct> page = new Page<>(driveSchoolDeduct.getPageNum(), driveSchoolDeduct.getPageSize());
-        List<DriveSchoolDeduct> list = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct);
+        IPage<DriveSchoolDeduct> driveSchoolDeductIPage = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolDeductIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出提成配置列表
      */
     //@Log(title = "提成配置", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolDeduct driveSchoolDeduct)
+//    public void export(HttpServletResponse response, DriveSchoolDeduct driveSchoolDeduct)
-    {
+//    {
-        List<DriveSchoolDeduct> list = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct);
+//        List<DriveSchoolDeduct> list = driveSchoolDeductService.selectDriveSchoolDeductList(driveSchoolDeduct);
-        ExcelUtil<DriveSchoolDeduct> util = new ExcelUtil<DriveSchoolDeduct>(DriveSchoolDeduct.class);
+//        ExcelUtil<DriveSchoolDeduct> util = new ExcelUtil<DriveSchoolDeduct>(DriveSchoolDeduct.class);
-        util.exportExcel(response, list, "提成配置数据");
+//        util.exportExcel(response, list, "提成配置数据");
-    }
+//    }
 
     /**
      * 获取提成配置详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDialController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDial;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolDialService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 日常日志Controller
  *
@@ -29,35 +26,37 @@ public class DriveSchoolDialController extends BaseController
      * 查询日常日志列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolDial driveSchoolDial)
+    public CommonResult<IPage<?>> list(DriveSchoolDial driveSchoolDial)
     {
-        startPage();
+        Page<DriveSchoolDial> page = new Page<>(driveSchoolDial.getPageNum(), driveSchoolDial.getPageSize());
-        List<DriveSchoolDial> list = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial);
+        IPage<DriveSchoolDial> driveSchoolDialIPage = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolDialIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 查询日常日志列表
      */
     @GetMapping("/appList")
-    public TableDataInfo appList(DriveSchoolDial driveSchoolDial)
+    public CommonResult<IPage<?>> appList(DriveSchoolDial driveSchoolDial)
     {
-        startPage();
+        Page<DriveSchoolDial> page = new Page<>(driveSchoolDial.getPageNum(), driveSchoolDial.getPageSize());
-        List<DriveSchoolDial> list = driveSchoolDialService.selectDriveSchoolDialAppList(driveSchoolDial);
+        IPage<DriveSchoolDial> driveSchoolDialIPage = driveSchoolDialService.selectDriveSchoolDialAppList(driveSchoolDial, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolDialIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出日常日志列表
      */
     //@Log(title = "日常日志", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolDial driveSchoolDial)
+//    public void export(HttpServletResponse response, DriveSchoolDial driveSchoolDial)
-    {
+//    {
-        List<DriveSchoolDial> list = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial);
+//        List<DriveSchoolDial> list = driveSchoolDialService.selectDriveSchoolDialList(driveSchoolDial);
-        ExcelUtil<DriveSchoolDial> util = new ExcelUtil<DriveSchoolDial>(DriveSchoolDial.class);
+//        ExcelUtil<DriveSchoolDial> util = new ExcelUtil<DriveSchoolDial>(DriveSchoolDial.class);
-        util.exportExcel(response, list, "日常日志数据");
+//        util.exportExcel(response, list, "日常日志数据");
-    }
+//    }
 
     /**
      * 获取日常日志详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java

@@ -2,14 +2,12 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDynamic;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolDynamicService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -29,11 +27,12 @@ public class DriveSchoolDynamicController extends BaseController
      * 查询行业动态列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolDynamic driveSchoolDynamic)
+    public CommonResult<IPage<?>> list(DriveSchoolDynamic driveSchoolDynamic)
     {
-        startPage();
+        Page<DriveSchoolDynamic> page = new Page<>(driveSchoolDynamic.getPageNum(), driveSchoolDynamic.getPageSize());
-        List<DriveSchoolDynamic> list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic);
+            IPage<DriveSchoolDynamic> driveSchoolDynamicIPage = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic, page);
-        return getDataTable(list);
+            return CommonResult.success(driveSchoolDynamicIPage);
+        //return getDataTable(list);
     }
 
     /**
@@ -42,7 +41,7 @@ public class DriveSchoolDynamicController extends BaseController
     @GetMapping("/applist")
     public CommonResult applist(DriveSchoolDynamic driveSchoolDynamic)
     {
-        List<DriveSchoolDynamic> list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic);
+        List<DriveSchoolDynamic> list = driveSchoolDynamicService.selectDriveSchoolDynamicListAll(driveSchoolDynamic);
         return CommonResult.success(list);
     }
 
@@ -50,13 +49,13 @@ public class DriveSchoolDynamicController extends BaseController
      * 导出行业动态列表
      */
     //@Log(title = "行业动态", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolDynamic driveSchoolDynamic)
+//    public void export(HttpServletResponse response, DriveSchoolDynamic driveSchoolDynamic)
-    {
+//    {
-        List<DriveSchoolDynamic> list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic);
+//        List<DriveSchoolDynamic> list = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic);
-        ExcelUtil<DriveSchoolDynamic> util = new ExcelUtil<DriveSchoolDynamic>(DriveSchoolDynamic.class);
+//        ExcelUtil<DriveSchoolDynamic> util = new ExcelUtil<DriveSchoolDynamic>(DriveSchoolDynamic.class);
-        util.exportExcel(response, list, "行业动态数据");
+//        util.exportExcel(response, list, "行业动态数据");
-    }
+//    }
 
     /**
      * 获取行业动态详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolExamPassController.java

@@ -4,22 +4,18 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolExamPass;
 import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCoachMapper;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolExamPassService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import com.thoughtworks.xstream.core.SecurityUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 考试通过Controller
@@ -41,22 +37,24 @@ public class DriveSchoolExamPassController extends BaseController
      * 查询考试通过列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolExamPass driveSchoolExamPass)
+    public CommonResult<IPage<?>> list(DriveSchoolExamPass driveSchoolExamPass)
     {
-        startPage();
+        Page<DriveSchoolExamPass> page = new Page<>(driveSchoolExamPass.getPageNum(), driveSchoolExamPass.getPageSize());
-        List<DriveSchoolExamPass> list = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass);
+        IPage<DriveSchoolExamPass> driveSchoolExamPassIPage = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolExamPassIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 查询教练工资
      */
     @GetMapping("/getBalanceList")
-    public TableDataInfo getBalanceList(DriveSchoolExamPass driveSchoolExamPass)
+    public CommonResult<IPage<?>> getBalanceList(DriveSchoolExamPass driveSchoolExamPass)
     {
-        startPage();
+        Page<DriveSchoolExamPass> page = new Page<>(driveSchoolExamPass.getPageNum(), driveSchoolExamPass.getPageSize());
-        List<DriveSchoolExamPass> list = driveSchoolExamPassService.getBalanceList(driveSchoolExamPass);
+        IPage<DriveSchoolExamPass> balanceList = driveSchoolExamPassService.getBalanceList(driveSchoolExamPass, page);
-        return getDataTable(list);
+        return CommonResult.success(balanceList);
+        //return getDataTable(list);
     }
 
     /**
@@ -109,7 +107,7 @@ public class DriveSchoolExamPassController extends BaseController
      * 账单管理
      */
     @GetMapping("/checkList")
-    public TableDataInfo checkList(DriveSchoolExamPass driveSchoolExamPass)
+    public CommonResult<IPage<?>> checkList(DriveSchoolExamPass driveSchoolExamPass)
     {
         //获取教练id
         Long userId = SecurityFrameworkUtils.getLoginUserId();
@@ -124,22 +122,23 @@ public class DriveSchoolExamPassController extends BaseController
         }
         driveSchoolExamPass.setJlId(jlId);
 
-        startPage();
+        Page<DriveSchoolExamPass> page = new Page<>(driveSchoolExamPass.getPageNum(), driveSchoolExamPass.getPageSize());
-        List<DriveSchoolExamPass> list = driveSchoolExamPassService.checkList(driveSchoolExamPass);
+        IPage<DriveSchoolExamPass> driveSchoolExamPassIPage = driveSchoolExamPassService.checkList(driveSchoolExamPass, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolExamPassIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出考试通过列表
      */
     //@Log(title = "考试通过", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolExamPass driveSchoolExamPass)
+//    public void export(HttpServletResponse response, DriveSchoolExamPass driveSchoolExamPass)
-    {
+//    {
-        List<DriveSchoolExamPass> list = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass);
+//        List<DriveSchoolExamPass> list = driveSchoolExamPassService.selectDriveSchoolExamPassList(driveSchoolExamPass);
-        ExcelUtil<DriveSchoolExamPass> util = new ExcelUtil<DriveSchoolExamPass>(DriveSchoolExamPass.class);
+//        ExcelUtil<DriveSchoolExamPass> util = new ExcelUtil<DriveSchoolExamPass>(DriveSchoolExamPass.class);
-        util.exportExcel(response, list, "考试通过数据");
+//        util.exportExcel(response, list, "考试通过数据");
-    }
+//    }
 
     /**
      * 获取考试通过详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFacilityController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolFacility;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolFacilityService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 设备管理Controller
  *
@@ -29,24 +26,25 @@ public class DriveSchoolFacilityController extends BaseController
      * 查询设备管理列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolFacility driveSchoolFacility)
+    public CommonResult<IPage<?>> list(DriveSchoolFacility driveSchoolFacility)
     {
-        startPage();
+        Page<DriveSchoolFacility> page = new Page<>(driveSchoolFacility.getPageNum(), driveSchoolFacility.getPageSize());
-        List<DriveSchoolFacility> list = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility);
+        IPage<DriveSchoolFacility> driveSchoolFacilityIPage = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility, page);
-        return getDataTable(list);
+        return success(driveSchoolFacilityIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出设备管理列表
      */
     //@Log(title = "设备管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolFacility driveSchoolFacility)
+//    public void export(HttpServletResponse response, DriveSchoolFacility driveSchoolFacility)
-    {
+//    {
-        List<DriveSchoolFacility> list = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility);
+//        List<DriveSchoolFacility> list = driveSchoolFacilityService.selectDriveSchoolFacilityList(driveSchoolFacility);
-        ExcelUtil<DriveSchoolFacility> util = new ExcelUtil<DriveSchoolFacility>(DriveSchoolFacility.class);
+//        ExcelUtil<DriveSchoolFacility> util = new ExcelUtil<DriveSchoolFacility>(DriveSchoolFacility.class);
-        util.exportExcel(response, list, "设备管理数据");
+//        util.exportExcel(response, list, "设备管理数据");
-    }
+//    }
 
     /**
      * 获取设备管理详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFileController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolFile;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolFileService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 文件类型Controller
  *
@@ -29,11 +26,12 @@ public class DriveSchoolFileController extends BaseController
      * 查询文件类型列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolFile driveSchoolFile)
+    public CommonResult<IPage<?>> list(DriveSchoolFile driveSchoolFile)
     {
-        startPage();
+        Page<DriveSchoolFile> page = new Page<>(driveSchoolFile.getPageNum(), driveSchoolFile.getPageSize());
-        List<DriveSchoolFile> list = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile);
+        IPage<DriveSchoolFile> driveSchoolFileIPage = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolFileIPage);
+        //return getDataTable(list);
     }
 
 
@@ -52,13 +50,13 @@ public class DriveSchoolFileController extends BaseController
      * 导出文件类型列表
      */
     //@Log(title = "文件类型", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolFile driveSchoolFile)
+//    public void export(HttpServletResponse response, DriveSchoolFile driveSchoolFile)
-    {
+//    {
-        List<DriveSchoolFile> list = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile);
+//        List<DriveSchoolFile> list = driveSchoolFileService.selectDriveSchoolFileList(driveSchoolFile);
-        ExcelUtil<DriveSchoolFile> util = new ExcelUtil<DriveSchoolFile>(DriveSchoolFile.class);
+//        ExcelUtil<DriveSchoolFile> util = new ExcelUtil<DriveSchoolFile>(DriveSchoolFile.class);
-        util.exportExcel(response, list, "文件类型数据");
+//        util.exportExcel(response, list, "文件类型数据");
-    }
+//    }
 
     /**
      * 获取文件类型详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java

@@ -2,15 +2,14 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo;
 import cn.iocoder.yudao.module.jx.payment.vo.PayVo;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -41,24 +40,25 @@ public class DriveSchoolInfoController extends BaseController
      */
 
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolInfo driveSchoolInfo)
+    public CommonResult<IPage<?>> list(DriveSchoolInfo driveSchoolInfo)
     {
-        startPage();
+        Page<DriveSchoolInfo> page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize());
-        List<DriveSchoolInfo> list = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo);
+        IPage<DriveSchoolInfo> driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolInfoIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出驾校信息列表
      */
     //@Log(title = "驾校信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolInfo driveSchoolInfo)
+//    public void export(HttpServletResponse response, DriveSchoolInfo driveSchoolInfo)
-    {
+//    {
-        List<DriveSchoolInfo> list = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo);
+//        List<DriveSchoolInfo> list = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo);
-        ExcelUtil<DriveSchoolInfo> util = new ExcelUtil<DriveSchoolInfo>(DriveSchoolInfo.class);
+//        ExcelUtil<DriveSchoolInfo> util = new ExcelUtil<DriveSchoolInfo>(DriveSchoolInfo.class);
-        util.exportExcel(response, list, "驾校信息数据");
+//        util.exportExcel(response, list, "驾校信息数据");
-    }
+//    }
 
     /**
      * 获取驾校信息详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInsuranceController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolInsurance;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolInsuranceService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 保险管理Controller
  *
@@ -29,24 +26,25 @@ public class DriveSchoolInsuranceController extends BaseController
      * 查询保险管理列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolInsurance driveSchoolInsurance)
+    public CommonResult<IPage<?>> list(DriveSchoolInsurance driveSchoolInsurance)
     {
-        startPage();
+        Page<DriveSchoolInsurance> page = new Page<>(driveSchoolInsurance.getPageNum(), driveSchoolInsurance.getPageSize());
-        List<DriveSchoolInsurance> list = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance);
+        IPage<DriveSchoolInsurance> driveSchoolInsuranceIPage = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance, page);
-        return getDataTable(list);
+        return success(driveSchoolInsuranceIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出保险管理列表
      */
     //@Log(title = "保险管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolInsurance driveSchoolInsurance)
+//    public void export(HttpServletResponse response, DriveSchoolInsurance driveSchoolInsurance)
-    {
+//    {
-        List<DriveSchoolInsurance> list = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance);
+//        List<DriveSchoolInsurance> list = driveSchoolInsuranceService.selectDriveSchoolInsuranceList(driveSchoolInsurance);
-        ExcelUtil<DriveSchoolInsurance> util = new ExcelUtil<DriveSchoolInsurance>(DriveSchoolInsurance.class);
+//        ExcelUtil<DriveSchoolInsurance> util = new ExcelUtil<DriveSchoolInsurance>(DriveSchoolInsurance.class);
-        util.exportExcel(response, list, "保险管理数据");
+//        util.exportExcel(response, list, "保险管理数据");
-    }
+//    }
 
     /**
      * 获取保险管理详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNewsController.java

@@ -3,14 +3,12 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolNews;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolNewsService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -30,11 +28,12 @@ public class DriveSchoolNewsController extends BaseController
      * 查询校内新闻列表
      */
     @GetMapping("/list")
-    public TableDataInfo pclist(DriveSchoolNews driveSchoolNews)
+    public CommonResult<IPage<?>> pclist(DriveSchoolNews driveSchoolNews)
     {
-        startPage();
+        Page<DriveSchoolNews> page = new Page<>(driveSchoolNews.getPageNum(), driveSchoolNews.getPageSize());
-        List<DriveSchoolNews> list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews);
+        IPage<DriveSchoolNews> driveSchoolNewsIPage = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolNewsIPage);
+        //return getDataTable(list);
     }
 
     /**
@@ -43,7 +42,7 @@ public class DriveSchoolNewsController extends BaseController
     @GetMapping("/applist")
     public CommonResult list(DriveSchoolNews driveSchoolNews)
     {
-        List<DriveSchoolNews> list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews);
+        List<DriveSchoolNews> list = driveSchoolNewsService.selectDriveSchoolNewsListAll(driveSchoolNews);
         return CommonResult.success(list);
     }
 
@@ -51,13 +50,13 @@ public class DriveSchoolNewsController extends BaseController
      * 导出校内新闻列表
      */
     //@Log(title = "校内新闻", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolNews driveSchoolNews)
+//    public void export(HttpServletResponse response, DriveSchoolNews driveSchoolNews)
-    {
+//    {
-        List<DriveSchoolNews> list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews);
+//        List<DriveSchoolNews> list = driveSchoolNewsService.selectDriveSchoolNewsList(driveSchoolNews);
-        ExcelUtil<DriveSchoolNews> util = new ExcelUtil<DriveSchoolNews>(DriveSchoolNews.class);
+//        ExcelUtil<DriveSchoolNews> util = new ExcelUtil<DriveSchoolNews>(DriveSchoolNews.class);
-        util.exportExcel(response, list, "校内新闻数据");
+//        util.exportExcel(response, list, "校内新闻数据");
-    }
+//    }
 
     /**
      * 获取校内新闻详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolNoticeController.java

@@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolNotice;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolNoticeService;
 import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -30,11 +29,12 @@ public class DriveSchoolNoticeController extends BaseController
      * 查询通知列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolNotice driveSchoolNotice)
+    public CommonResult<IPage<?>> list(DriveSchoolNotice driveSchoolNotice)
     {
-        startPage();
+        Page<DriveSchoolNotice> page = new Page<>(driveSchoolNotice.getPageNum(), driveSchoolNotice.getPageSize());
-        List<DriveSchoolNotice> list = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice);
+        IPage<DriveSchoolNotice> driveSchoolNoticeIPage = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolNoticeIPage);
+        //return getDataTable(list);
     }
 
 
@@ -52,13 +52,13 @@ public class DriveSchoolNoticeController extends BaseController
      * 导出通知列表
      */
     //@Log(title = "通知", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolNotice driveSchoolNotice)
+//    public void export(HttpServletResponse response, DriveSchoolNotice driveSchoolNotice)
-    {
+//    {
-        List<DriveSchoolNotice> list = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice);
+//        List<DriveSchoolNotice> list = driveSchoolNoticeService.selectDriveSchoolNoticeList(driveSchoolNotice);
-        ExcelUtil<DriveSchoolNotice> util = new ExcelUtil<DriveSchoolNotice>(DriveSchoolNotice.class);
+//        ExcelUtil<DriveSchoolNotice> util = new ExcelUtil<DriveSchoolNotice>(DriveSchoolNotice.class);
-        util.exportExcel(response, list, "通知数据");
+//        util.exportExcel(response, list, "通知数据");
-    }
+//    }
 
     /**
      * 获取通知详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolPhoneController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolPhone;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolPhoneService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 客服Controller
  *
@@ -29,11 +26,12 @@ public class DriveSchoolPhoneController extends BaseController
      * 查询客服列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolPhone driveSchoolPhone)
+    public CommonResult<IPage<?>> list(DriveSchoolPhone driveSchoolPhone)
     {
-        startPage();
+        Page<DriveSchoolPhone> page = new Page<>(driveSchoolPhone.getPageNum(), driveSchoolPhone.getPageSize());
-        List<DriveSchoolPhone> list = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone);
+        IPage<DriveSchoolPhone> driveSchoolPhoneIPage = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolPhoneIPage);
+        //return getDataTable(list);
     }
 
     /**
@@ -50,13 +48,13 @@ public class DriveSchoolPhoneController extends BaseController
      * 导出客服列表
      */
     //@Log(title = "客服", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolPhone driveSchoolPhone)
+//    public void export(HttpServletResponse response, DriveSchoolPhone driveSchoolPhone)
-    {
+//    {
-        List<DriveSchoolPhone> list = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone);
+//        List<DriveSchoolPhone> list = driveSchoolPhoneService.selectDriveSchoolPhoneList(driveSchoolPhone);
-        ExcelUtil<DriveSchoolPhone> util = new ExcelUtil<DriveSchoolPhone>(DriveSchoolPhone.class);
+//        ExcelUtil<DriveSchoolPhone> util = new ExcelUtil<DriveSchoolPhone>(DriveSchoolPhone.class);
-        util.exportExcel(response, list, "客服数据");
+//        util.exportExcel(response, list, "客服数据");
-    }
+//    }
 
     /**
      * 获取客服详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReimbursementController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolReimbursement;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolReimbursementService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 报销审核Controller
  *
@@ -29,24 +26,25 @@ public class DriveSchoolReimbursementController extends BaseController
      * 查询报销审核列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolReimbursement driveSchoolReimbursement)
+    public CommonResult<IPage<?>> list(DriveSchoolReimbursement driveSchoolReimbursement)
     {
-        startPage();
+        Page<DriveSchoolReimbursement> page = new Page<>(driveSchoolReimbursement.getPageNum(), driveSchoolReimbursement.getPageSize());
-        List<DriveSchoolReimbursement> list = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement);
+        IPage<DriveSchoolReimbursement> driveSchoolReimbursementIPage = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolReimbursementIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出报销审核列表
      */
     //@Log(title = "报销审核", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolReimbursement driveSchoolReimbursement)
+//    public void export(HttpServletResponse response, DriveSchoolReimbursement driveSchoolReimbursement)
-    {
+//    {
-        List<DriveSchoolReimbursement> list = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement);
+//        List<DriveSchoolReimbursement> list = driveSchoolReimbursementService.selectDriveSchoolReimbursementList(driveSchoolReimbursement);
-        ExcelUtil<DriveSchoolReimbursement> util = new ExcelUtil<DriveSchoolReimbursement>(DriveSchoolReimbursement.class);
+//        ExcelUtil<DriveSchoolReimbursement> util = new ExcelUtil<DriveSchoolReimbursement>(DriveSchoolReimbursement.class);
-        util.exportExcel(response, list, "报销审核数据");
+//        util.exportExcel(response, list, "报销审核数据");
-    }
+//    }
 
     /**
      * 获取报销审核详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java

@@ -3,15 +3,17 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolReservationCourse;
+import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal;
 import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCoachMapper;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolReservationCourseService;
 import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -48,31 +50,34 @@ public class DriveSchoolReservationCourseController extends BaseController
      * 查询预约练车列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolReservationCourse driveSchoolReservationCourse)
+    public CommonResult<IPage<?>> list(DriveSchoolReservationCourse driveSchoolReservationCourse)
     {
-        startPage();
+        Page<DriveSchoolReservationCourse> page = new Page<>(driveSchoolReservationCourse.getPageNum(), driveSchoolReservationCourse.getPageSize());
-        List<DriveSchoolReservationCourse> list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse);
+        IPage<DriveSchoolReservationCourse> driveSchoolReservationCourseIPage = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolReservationCourseIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 查询预约练车列表pc
      */
     @GetMapping("/pclist")
-    public TableDataInfo pclist(DriveSchoolReservationCourse driveSchoolReservationCourse)
+    public CommonResult<IPage<?>> pclist(DriveSchoolReservationCourse driveSchoolReservationCourse)
     {
-        startPage();
+        Page<DriveSchoolReservationCourse> page = new Page<>(driveSchoolReservationCourse.getPageNum(), driveSchoolReservationCourse.getPageSize());
-        List<DriveSchoolReservationCourse> list = driveSchoolReservationCourseService.selectDriveSchoolReservationCoursePclist(driveSchoolReservationCourse);
+        IPage<DriveSchoolReservationCourse> driveSchoolReservationCourseIPage = driveSchoolReservationCourseService.selectDriveSchoolReservationCoursePclist(driveSchoolReservationCourse, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolReservationCourseIPage);
+        //return getDataTable(list);
     }
 
     @GetMapping("/listUser")
     public CommonResult listUser(DriveSchoolReservationCourse driveSchoolReservationCourse)
     {
+        Page<DriveSchoolReservationCourse> page = new Page<>(driveSchoolReservationCourse.getPageNum(), 9999);
         driveSchoolReservationCourse.setUserId(SecurityFrameworkUtils.getLoginUserId());
-        List<DriveSchoolReservationCourse> list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse);
+        IPage<DriveSchoolReservationCourse> driveSchoolReservationCourseIPage = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page);
-
+        List<DriveSchoolReservationCourse> records = driveSchoolReservationCourseIPage.getRecords();
-        return CommonResult.success(list);
+        return CommonResult.success(records);
     }
 
     @GetMapping("/getListUser")
@@ -87,13 +92,13 @@ public class DriveSchoolReservationCourseController extends BaseController
      * 导出预约练车列表
      */
     //@Log(title = "预约练车", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolReservationCourse driveSchoolReservationCourse)
+//    public void export(HttpServletResponse response, DriveSchoolReservationCourse driveSchoolReservationCourse)
-    {
+//    {
-        List<DriveSchoolReservationCourse> list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse);
+//        List<DriveSchoolReservationCourse> list = driveSchoolReservationCourseService.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse);
-        ExcelUtil<DriveSchoolReservationCourse> util = new ExcelUtil<DriveSchoolReservationCourse>(DriveSchoolReservationCourse.class);
+//        ExcelUtil<DriveSchoolReservationCourse> util = new ExcelUtil<DriveSchoolReservationCourse>(DriveSchoolReservationCourse.class);
-        util.exportExcel(response, list, "预约练车数据");
+//        util.exportExcel(response, list, "预约练车数据");
-    }
+//    }
 
     /**
      * 获取预约练车详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSeparateController.java

@@ -3,15 +3,12 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolSeparate;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolSeparateService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,11 +28,12 @@ public class DriveSchoolSeparateController extends BaseController
      * 查询驾校分账列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolSeparate driveSchoolSeparate)
+    public CommonResult<IPage<?>> list(DriveSchoolSeparate driveSchoolSeparate)
     {
-        startPage();
+        Page<DriveSchoolSeparate> page = new Page<>(driveSchoolSeparate.getPageNum(), driveSchoolSeparate.getPageSize());
-        List<DriveSchoolSeparate> list = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate);
+        IPage<DriveSchoolSeparate> driveSchoolSeparateIPage = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolSeparateIPage);
+        //return getDataTable(list);
     }
 
     /**
@@ -52,13 +50,13 @@ public class DriveSchoolSeparateController extends BaseController
      * 导出驾校分账列表
      */
     //@Log(title = "驾校分账", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolSeparate driveSchoolSeparate)
+//    public void export(HttpServletResponse response, DriveSchoolSeparate driveSchoolSeparate)
-    {
+//    {
-        List<DriveSchoolSeparate> list = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate);
+//        List<DriveSchoolSeparate> list = driveSchoolSeparateService.selectDriveSchoolSeparateList(driveSchoolSeparate);
-        ExcelUtil<DriveSchoolSeparate> util = new ExcelUtil<DriveSchoolSeparate>(DriveSchoolSeparate.class);
+//        ExcelUtil<DriveSchoolSeparate> util = new ExcelUtil<DriveSchoolSeparate>(DriveSchoolSeparate.class);
-        util.exportExcel(response, list, "驾校分账数据");
+//        util.exportExcel(response, list, "驾校分账数据");
-    }
+//    }
 
     /**
      * 获取驾校分账详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTeachingJournalController.java

@@ -2,11 +2,8 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolTeachingJournalService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
-import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolTextController.java

@@ -3,16 +3,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolText;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolTextService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 驾校公告Controller
  *
@@ -30,24 +27,25 @@ public class DriveSchoolTextController extends BaseController
      * 查询驾校公告列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolText driveSchoolText)
+    public CommonResult<IPage<?>> list(DriveSchoolText driveSchoolText)
     {
-        startPage();
+        Page<DriveSchoolText> page = new Page<>(driveSchoolText.getPageNum(), driveSchoolText.getPageSize());
-        List<DriveSchoolText> list = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText);
+        IPage<DriveSchoolText> driveSchoolTextIPage = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolTextIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出驾校公告列表
      */
     //@Log(title = "驾校公告", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolText driveSchoolText)
+//    public void export(HttpServletResponse response, DriveSchoolText driveSchoolText)
-    {
+//    {
-        List<DriveSchoolText> list = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText);
+//        List<DriveSchoolText> list = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText);
-        ExcelUtil<DriveSchoolText> util = new ExcelUtil<DriveSchoolText>(DriveSchoolText.class);
+//        ExcelUtil<DriveSchoolText> util = new ExcelUtil<DriveSchoolText>(DriveSchoolText.class);
-        util.exportExcel(response, list, "驾校公告数据");
+//        util.exportExcel(response, list, "驾校公告数据");
-    }
+//    }
 
     /**
      * 获取驾校公告详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolUpkeepController.java

@@ -2,17 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolUpkeep;
 import cn.iocoder.yudao.module.jx.service.IDriveSchoolUpkeepService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 车辆保养记录Controller
  *
@@ -31,24 +27,25 @@ public class DriveSchoolUpkeepController extends BaseController
      */
     //@PreAuthorize("@ss.hasPermi('drivingSchool/system:drivingSchoolUpkeep:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DriveSchoolUpkeep driveSchoolUpkeep)
+    public CommonResult<IPage<?>> list(DriveSchoolUpkeep driveSchoolUpkeep)
     {
-        startPage();
+        Page<DriveSchoolUpkeep> page = new Page<>(driveSchoolUpkeep.getPageNum(), driveSchoolUpkeep.getPageSize());
-        List<DriveSchoolUpkeep> list = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep);
+        IPage<DriveSchoolUpkeep> driveSchoolUpkeepIPage = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep, page);
-        return getDataTable(list);
+        return CommonResult.success(driveSchoolUpkeepIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出车辆保养记录列表
      */
     //@Log(title = "车辆保养记录", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, DriveSchoolUpkeep driveSchoolUpkeep)
+//    public void export(HttpServletResponse response, DriveSchoolUpkeep driveSchoolUpkeep)
-    {
+//    {
-        List<DriveSchoolUpkeep> list = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep);
+//        List<DriveSchoolUpkeep> list = driveSchoolUpkeepService.selectDriveSchoolUpkeepList(driveSchoolUpkeep);
-        ExcelUtil<DriveSchoolUpkeep> util = new ExcelUtil<DriveSchoolUpkeep>(DriveSchoolUpkeep.class);
+//        ExcelUtil<DriveSchoolUpkeep> util = new ExcelUtil<DriveSchoolUpkeep>(DriveSchoolUpkeep.class);
-        util.exportExcel(response, list, "车辆保养记录数据");
+//        util.exportExcel(response, list, "车辆保养记录数据");
-    }
+//    }
 
     /**
      * 获取车辆保养记录详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/SopeNessController.java

@@ -2,16 +2,13 @@ package cn.iocoder.yudao.module.jx.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.jx.core.controller.BaseController;
-import cn.iocoder.yudao.module.jx.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.jx.domain.SopeNess;
 import cn.iocoder.yudao.module.jx.service.ISopeNessService;
-import cn.iocoder.yudao.module.jx.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * 经营范围Controller
  *
@@ -29,24 +26,25 @@ public class SopeNessController extends BaseController
      * 查询经营范围列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(SopeNess sopeNess)
+    public CommonResult<IPage<?>> list(SopeNess sopeNess)
     {
-        startPage();
+        Page<SopeNess> page = new Page<>(sopeNess.getPageNum(), sopeNess.getPageSize());
-        List<SopeNess> list = sopeNessService.selectSopeNessList(sopeNess);
+        IPage<SopeNess> sopeNessIPage = sopeNessService.selectSopeNessList(sopeNess, page);
-        return getDataTable(list);
+        return CommonResult.success(sopeNessIPage);
+        //return getDataTable(list);
     }
 
     /**
      * 导出经营范围列表
      */
-    @PostMapping("/export")
+//    @PostMapping("/export")
-    public void export(HttpServletResponse response, SopeNess sopeNess)
+//    public void export(HttpServletResponse response, SopeNess sopeNess)
-    {
+//    {
-
+//
-        List<SopeNess> list = sopeNessService.selectSopeNessList(sopeNess);
+//        List<SopeNess> list = sopeNessService.selectSopeNessList(sopeNess);
-        ExcelUtil<SopeNess> util = new ExcelUtil<SopeNess>(SopeNess.class);
+//        ExcelUtil<SopeNess> util = new ExcelUtil<SopeNess>(SopeNess.class);
-        util.exportExcel(response, list, "经营范围数据");
+//        util.exportExcel(response, list, "经营范围数据");
-    }
+//    }
 
     /**
      * 获取经营范围详细信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/controller/BaseController.java

@@ -5,8 +5,10 @@ import cn.iocoder.yudao.module.jx.core.page.*;
 import cn.iocoder.yudao.module.jx.core.text.HttpStatus;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.module.jx.domain.DriveSchoolTeachingJournal;
 import cn.iocoder.yudao.module.jx.utils.DateUtils;
 import cn.iocoder.yudao.module.jx.utils.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -54,7 +56,7 @@ public class BaseController
      */
     protected void startPage()
     {
-        PageUtils.startPage();
+        //Page<DriveSchoolTeachingJournal> page = new Page<>(driveSchoolTeachingJournal.getPageNum(), driveSchoolTeachingJournal.getPageSize());
     }
 
     /**
@@ -82,13 +84,13 @@ public class BaseController
      * 响应请求分页数据
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    protected TableDataInfo getDataTable(List<?> list)
+    protected CommonResult<IPage<?>> getDataTable(List<?> list)
     {
-        TableDataInfo rspData = new TableDataInfo();
+        CommonResult<IPage<?>> rspData = new CommonResult<IPage<?>>();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setMsg("查询成功");
-        rspData.setRows(list);
+//        rspData.setRows(list);
-        rspData.setTotal(new PageInfo(list).getTotal());
+//        rspData.setTotal(new PageInfo(list).getTotal());
         return rspData;
     }
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/BaseEntity.java

@@ -1,114 +0,0 @@
-package cn.iocoder.yudao.module.jx.core.page;
-
-import cn.iocoder.yudao.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Entity基类
- *
- * @author ruoyi
- */
-@Data
-public class BaseEntity implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 搜索值 */
-    @JsonIgnore
-    @TableField(exist = false)
-    private String searchValue;
-
-    /** 创建者 */
-    private String creator;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "报名日期")
-    private Date createTime;
-
-    /** 更新者 */
-    private String updater;
-
-    /** 当前记录起始索引 */
-    private Integer pageNum;
-
-    /** 每页显示记录数 */
-    private Integer pageSize;
-
-    /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /** 备注 */
-    @TableField(exist = false)
-    private String remark;
-
-    /** 请求参数 */
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    @TableField(exist = false)
-    private Map<String, Object> params;
-
-    public String getSearchValue()
-    {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue)
-    {
-        this.searchValue = searchValue;
-    }
-
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime()
-    {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime)
-    {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
-    public void setParams(Map<String, Object> params)
-    {
-        this.params = params;
-    }
-}

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TableDataInfo.java

@@ -1,85 +0,0 @@
-package cn.iocoder.yudao.module.jx.core.page;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 表格分页数据对象
- *
- * @author ruoyi
- */
-public class TableDataInfo implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 总记录数 */
-    private long total;
-
-    /** 列表数据 */
-    private List<?> rows;
-
-    /** 消息状态码 */
-    private int code;
-
-    /** 消息内容 */
-    private String msg;
-
-    /**
-     * 表格数据对象
-     */
-    public TableDataInfo()
-    {
-    }
-
-    /**
-     * 分页
-     *
-     * @param list 列表数据
-     * @param total 总记录数
-     */
-    public TableDataInfo(List<?> list, int total)
-    {
-        this.rows = list;
-        this.total = total;
-    }
-
-    public long getTotal()
-    {
-        return total;
-    }
-
-    public void setTotal(long total)
-    {
-        this.total = total;
-    }
-
-    public List<?> getRows()
-    {
-        return rows;
-    }
-
-    public void setRows(List<?> rows)
-    {
-        this.rows = rows;
-    }
-
-    public int getCode()
-    {
-        return code;
-    }
-
-    public void setCode(int code)
-    {
-        this.code = code;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-}

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/core/page/TenantBaDO.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.jx.core.page;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fhs.core.trans.vo.TransPojo;
+import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@JsonIgnoreProperties(value = "transMap")
+public class TenantBaDO implements Serializable, TransPojo {
+    /**
+     * 多租户编号
+     */
+    private Long tenantId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+    /**
+     * 最后更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+    /**
+     * 创建者，目前使用 SysUser 的 id 编号
+     *
+     * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。
+     */
+    @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
+    private String creator;
+    /**
+     * 更新者，目前使用 SysUser 的 id 编号
+     *
+     * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE, jdbcType = JdbcType.VARCHAR)
+    private String updater;
+    /**
+     * 是否删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+    /** 当前记录起始索引 */
+    private Integer pageNum;
+
+    /** 每页显示记录数 */
+    private Integer pageSize;
+
+}

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveCarBind.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024-04-01
  */
 @Data
-public class DriveCarBind extends BaseEntity
+public class DriveCarBind extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveContractTest.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-25
  */
 @Data
-public class DriveContractTest extends BaseEntity
+public class DriveContractTest extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -16,7 +16,7 @@ import java.util.Date;
  * @date 2024-05-08
  */
 @Data
-public class DriveSchoolCar extends BaseEntity
+public class DriveSchoolCar extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCarRepair.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -15,7 +15,7 @@ import java.util.Date;
  * @date 2024-04-01
  */
 @Data
-public class DriveSchoolCarRepair extends BaseEntity
+public class DriveSchoolCarRepair extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCheck.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,7 +17,7 @@ import java.util.Date;
  * @date 2024-05-10
  */
 @Data
-public class DriveSchoolCheck extends BaseEntity
+public class DriveSchoolCheck extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCoach.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 
 /**
@@ -11,7 +11,7 @@ import lombok.Data;
  * @date 2024-03-29
  */
 @Data
-public class DriveSchoolCoach extends BaseEntity
+public class DriveSchoolCoach extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolContract.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-25
  */
 @Data
-public class DriveSchoolContract extends BaseEntity
+public class DriveSchoolContract extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourse.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
@@ -15,7 +15,7 @@ import java.util.List;
  * @date 2024-03-21
  */
 @Data
-public class DriveSchoolCourse extends BaseEntity
+public class DriveSchoolCourse extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCourseOrder.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * @date 2024-03-25
  */
 @Data
-public class DriveSchoolCourseOrder extends BaseEntity
+public class DriveSchoolCourseOrder extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCredentials.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import lombok.Data;
@@ -15,7 +15,7 @@ import java.util.Date;
  * @date 2024-05-23
  */
 @Data
-public class DriveSchoolCredentials extends BaseEntity
+public class DriveSchoolCredentials extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDailyManagement.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024-05-24
  */
 @Data
-public class DriveSchoolDailyManagement extends BaseEntity
+public class DriveSchoolDailyManagement extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDeduct.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  * @date 2024-05-07
  */
 @Data
-public class DriveSchoolDeduct extends BaseEntity
+public class DriveSchoolDeduct extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDial.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-24
  */
 @Data
-public class DriveSchoolDial extends BaseEntity
+public class DriveSchoolDial extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolDynamic.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-10
  */
 @Data
-public class DriveSchoolDynamic extends BaseEntity
+public class DriveSchoolDynamic extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolExamPass.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -19,7 +19,7 @@ import java.util.Date;
  */
 
 @Data
-public class DriveSchoolExamPass extends BaseEntity
+public class DriveSchoolExamPass extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFacility.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -14,7 +14,7 @@ import java.util.Date;
  * @date 2024-05-23
  */
 @Data
-public class DriveSchoolFacility extends BaseEntity
+public class DriveSchoolFacility extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFile.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-10
  */
 @Data
-public class DriveSchoolFile extends BaseEntity
+public class DriveSchoolFile extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInfo.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * @date 2024-03-19
  */
 @Data
-public class DriveSchoolInfo extends BaseEntity
+public class DriveSchoolInfo extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolInsurance.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import lombok.Data;
@@ -16,7 +16,7 @@ import java.util.Date;
  * @date 2024-05-06
  */
 @Data
-public class DriveSchoolInsurance extends BaseEntity
+public class DriveSchoolInsurance extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNews.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-10
  */
 @Data
-public class DriveSchoolNews extends BaseEntity
+public class DriveSchoolNews extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolNotice.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-28
  */
 @Data
-public class DriveSchoolNotice extends BaseEntity
+public class DriveSchoolNotice extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolPhone.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-10
  */
 @Data
-public class DriveSchoolPhone extends BaseEntity
+public class DriveSchoolPhone extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReimbursement.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-19
  */
 @Data
-public class DriveSchoolReimbursement extends BaseEntity
+public class DriveSchoolReimbursement extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolReservationCourse.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolPay;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -17,7 +17,7 @@ import java.util.Date;
  * @date 2024-04-08
  */
 @Data
-public class DriveSchoolReservationCourse extends BaseEntity
+public class DriveSchoolReservationCourse extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSeparate.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-05-28
  */
 @Data
-public class DriveSchoolSeparate extends BaseEntity
+public class DriveSchoolSeparate extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolSwiper.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024-03-19
  */
 @Data
-public class DriveSchoolSwiper extends BaseEntity
+public class DriveSchoolSwiper extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolTeachingJournal.java

@@ -3,7 +3,8 @@ package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -22,7 +23,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class DriveSchoolTeachingJournal extends TenantBaseDO
+public class DriveSchoolTeachingJournal extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolText.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.jx.domain;
 
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import lombok.Data;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024-04-16
  */
 @Data
-public class DriveSchoolText extends BaseEntity
+public class DriveSchoolText extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolUpkeep.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import lombok.Data;
@@ -15,7 +15,7 @@ import java.util.Date;
  * @date 2024-04-01
  */
 @Data
-public class DriveSchoolUpkeep extends BaseEntity
+public class DriveSchoolUpkeep extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/SopeNess.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.domain;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -15,7 +15,7 @@ import java.util.Date;
  * @date 2024-05-23
  */
 @Data
-public class SopeNess extends BaseEntity
+public class SopeNess extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveCarBindMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveCarBind;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveCarBindMapper
      * @param driveCarBind 车辆绑定（教练）
      * @return 车辆绑定（教练）集合
      */
-    public List<DriveCarBind> selectDriveCarBindList(DriveCarBind driveCarBind);
+    public IPage<DriveCarBind> selectDriveCarBindList(@Param("entity") DriveCarBind driveCarBind, Page<DriveCarBind> page);
 
     /**
      * 新增车辆绑定（教练）

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveContractTestMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveContractTest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,7 @@ public interface DriveContractTestMapper
      * @param driveContractTest 合同模板
      * @return 合同模板集合
      */
-    public List<DriveContractTest> selectDriveContractTestList(DriveContractTest driveContractTest);
+    public IPage<DriveContractTest> selectDriveContractTestList(@Param("entity") DriveContractTest driveContractTest, Page<DriveContractTest> page);
 
     /**
      * 新增合同模板

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,8 @@ public interface DriveSchoolCarMapper
      * @param driveSchoolCar 车辆信息
      * @return 车辆信息集合
      */
-    public List<DriveSchoolCar> selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar);
+    public IPage<DriveSchoolCar> selectDriveSchoolCarList(@Param("entity") DriveSchoolCar driveSchoolCar, Page<DriveSchoolCar> page);
+    public List<DriveSchoolCar> selectDriveSchoolCarListAll(@Param("entity") DriveSchoolCar driveSchoolCar);
 
     /**
      * 新增车辆信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarRepairMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCarRepair;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,8 @@ public interface DriveSchoolCarRepairMapper
      * @param driveSchoolCarRepair 车辆维修记录
      * @return 车辆维修记录集合
      */
-    public List<DriveSchoolCarRepair> selectDriveSchoolCarRepairList(DriveSchoolCarRepair driveSchoolCarRepair);
+    public IPage<DriveSchoolCarRepair> selectDriveSchoolCarRepairList(@Param("entity") DriveSchoolCarRepair driveSchoolCarRepair, Page<DriveSchoolCarRepair> page);
+    public List<DriveSchoolCarRepair> selectDriveSchoolCarRepairListAll(DriveSchoolCarRepair driveSchoolCarRepair);
 
     /**
      * 新增车辆维修记录

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCheckMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCheck;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolCheckMapper
      * @param driveSchoolCheck 车检管理
      * @return 车检管理集合
      */
-    public List<DriveSchoolCheck> selectDriveSchoolCheckList(DriveSchoolCheck driveSchoolCheck);
+    public IPage<DriveSchoolCheck> selectDriveSchoolCheckList(@Param("entity") DriveSchoolCheck driveSchoolCheck, Page<DriveSchoolCheck> page);
 
     /**
      * 新增车检管理

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCoachMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,8 @@ public interface DriveSchoolCoachMapper
      * @param driveSchoolCoach 驾校教练
      * @return 驾校教练集合
      */
-    public List<DriveSchoolCoach> selectDriveSchoolCoachList(DriveSchoolCoach driveSchoolCoach);
+    public IPage<DriveSchoolCoach> selectDriveSchoolCoachList(@Param("entity") DriveSchoolCoach driveSchoolCoach, Page<DriveSchoolCoach> page);
+    public List<DriveSchoolCoach> selectDriveSchoolCoachListAll(@Param("entity") DriveSchoolCoach driveSchoolCoach);
 
     /**
      * 新增驾校教练

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolContract;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolContractMapper
      * @param driveSchoolContract 驾校合同
      * @return 驾校合同集合
      */
-    public List<DriveSchoolContract> selectDriveSchoolContractList(DriveSchoolContract driveSchoolContract);
+    public IPage<DriveSchoolContract> selectDriveSchoolContractList(@Param("entity") DriveSchoolContract driveSchoolContract, Page<DriveSchoolContract> page);
 
     /**
      * 新增驾校合同

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,8 +31,9 @@ public interface DriveSchoolCourseMapper
      * @param driveSchoolCourse 驾校课程分类
      * @return 驾校课程分类集合
      */
-    public List<DriveSchoolCourse> selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse);
+    public IPage<DriveSchoolCourse> selectDriveSchoolCourseList(@Param("entity") DriveSchoolCourse driveSchoolCourse, Page<DriveSchoolCourse> page);
-    public List<DriveSchoolCourse> selectDriveSchoolCourseAppletList(DriveSchoolCourse driveSchoolCourse);
+    public IPage<DriveSchoolCourse> selectDriveSchoolCourseAppletList(@Param("entity") DriveSchoolCourse driveSchoolCourse,Page<DriveSchoolCourse> page);
+    public List<DriveSchoolCourse> selectDriveSchoolCourseAppletListAll(@Param("entity") DriveSchoolCourse driveSchoolCourse);
     public List<DriveSchoolCourse> selectDriveSchoolCourseAppletFavorableListList(DriveSchoolCourse driveSchoolCourse);
 
     /**

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCourseOrderMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourseOrder;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolCourseOrderMapper
      * @param driveSchoolCourseOrder 驾照报名订单
      * @return 驾照报名订单集合
      */
-    public List<DriveSchoolCourseOrder> selectDriveSchoolCourseOrderList(DriveSchoolCourseOrder driveSchoolCourseOrder);
+    public IPage<DriveSchoolCourseOrder> selectDriveSchoolCourseOrderList(@Param("entity") DriveSchoolCourseOrder driveSchoolCourseOrder, Page<DriveSchoolCourseOrder> page);
 
     /**
      * 新增驾照报名订单

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCredentialsMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCredentials;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolCredentialsMapper
      * @param driveSchoolCredentials 驾校资质信息
      * @return 驾校资质信息集合
      */
-    public List<DriveSchoolCredentials> selectDriveSchoolCredentialsList(DriveSchoolCredentials driveSchoolCredentials);
+    public IPage<DriveSchoolCredentials> selectDriveSchoolCredentialsList(@Param("entity") DriveSchoolCredentials driveSchoolCredentials, Page<DriveSchoolCredentials> page);
 
     /**
      * 新增驾校资质信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDailyManagementMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDailyManagement;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolDailyManagementMapper
      * @param driveSchoolDailyManagement 驾校日常管理
      * @return 驾校日常管理集合
      */
-    public List<DriveSchoolDailyManagement> selectDriveSchoolDailyManagementList(DriveSchoolDailyManagement driveSchoolDailyManagement);
+    public IPage<DriveSchoolDailyManagement> selectDriveSchoolDailyManagementList(@Param("entity") DriveSchoolDailyManagement driveSchoolDailyManagement, Page<DriveSchoolDailyManagement> page);
 
     /**
      * 新增驾校日常管理

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDeductMapper.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDeduct;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -29,7 +31,8 @@ public interface DriveSchoolDeductMapper
      * @param driveSchoolDeduct 提成配置
      * @return 提成配置集合
      */
-    public List<DriveSchoolDeduct> selectDriveSchoolDeductList(DriveSchoolDeduct driveSchoolDeduct);
+    public IPage<DriveSchoolDeduct> selectDriveSchoolDeductList(@Param("entity") DriveSchoolDeduct driveSchoolDeduct, Page<DriveSchoolDeduct> page);
+    public List<DriveSchoolDeduct> selectDriveSchoolDeductListAll(@Param("entity") DriveSchoolDeduct driveSchoolDeduct);
 
     /**
      * 新增提成配置

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDialMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDial;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,8 @@ public interface DriveSchoolDialMapper
      * @param driveSchoolDial 日常日志
      * @return 日常日志集合
      */
-    public List<DriveSchoolDial> selectDriveSchoolDialList(DriveSchoolDial driveSchoolDial);
+    public IPage<DriveSchoolDial> selectDriveSchoolDialList(@Param("entity") DriveSchoolDial driveSchoolDial, Page<DriveSchoolDial> page);
+    public List<DriveSchoolDial> selectDriveSchoolDialListAll(@Param("entity") DriveSchoolDial driveSchoolDial);
 
     /**
      * 新增日常日志

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolDynamicMapper.java

@@ -1,7 +1,11 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolDynamic;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +32,8 @@ public interface DriveSchoolDynamicMapper
      * @param driveSchoolDynamic 行业动态
      * @return 行业动态集合
      */
-    public List<DriveSchoolDynamic> selectDriveSchoolDynamicList(DriveSchoolDynamic driveSchoolDynamic);
+    public IPage<DriveSchoolDynamic> selectDriveSchoolDynamicList(@Param("entity") DriveSchoolDynamic driveSchoolDynamic, Page<DriveSchoolDynamic> page);
+    public List<DriveSchoolDynamic> selectDriveSchoolDynamicListAll(@Param("entity") DriveSchoolDynamic driveSchoolDynamic);
 
     /**
      * 新增行业动态

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolExamPassMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolExamPass;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolExamPassMapper
      * @param driveSchoolExamPass 考试通过
      * @return 考试通过集合
      */
-    public List<DriveSchoolExamPass> selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass);
+    public IPage<DriveSchoolExamPass> selectDriveSchoolExamPassList(@Param("entity") DriveSchoolExamPass driveSchoolExamPass, Page<DriveSchoolExamPass> page);
 
     /**
      * 新增考试通过
@@ -64,9 +67,9 @@ public interface DriveSchoolExamPassMapper
 
     List<DriveSchoolExamPass> selectDriveSchoolExamPassByUserId(Long userId);
 
-    List<DriveSchoolExamPass> checkList(Long userId);
+    IPage<DriveSchoolExamPass> checkList(@Param("Page") Long userId, Page<DriveSchoolExamPass> page);
 
-    List<DriveSchoolExamPass> getBalanceList(DriveSchoolExamPass driveSchoolExamPass);
+    IPage<DriveSchoolExamPass> getBalanceList(@Param("entity") DriveSchoolExamPass driveSchoolExamPass,Page<DriveSchoolExamPass> page);
     DriveSchoolExamPass getBalance(DriveSchoolExamPass driveSchoolExamPass);
     DriveSchoolExamPass getBalanceByCaochId(DriveSchoolExamPass driveSchoolExamPass);
     DriveSchoolExamPass getBalanceApp (DriveSchoolExamPass driveSchoolExamPass);

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFacilityMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolFacility;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,7 @@ public interface DriveSchoolFacilityMapper
      * @param driveSchoolFacility 设备管理
      * @return 设备管理集合
      */
-    public List<DriveSchoolFacility> selectDriveSchoolFacilityList(DriveSchoolFacility driveSchoolFacility);
+    public IPage<DriveSchoolFacility> selectDriveSchoolFacilityList(@Param("entity") DriveSchoolFacility driveSchoolFacility, Page<DriveSchoolFacility> page);
 
     /**
      * 新增设备管理

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFileMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolFile;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,8 @@ public interface DriveSchoolFileMapper
      * @param driveSchoolFile 文件类型
      * @return 文件类型集合
      */
-    public List<DriveSchoolFile> selectDriveSchoolFileList(DriveSchoolFile driveSchoolFile);
+    public IPage<DriveSchoolFile> selectDriveSchoolFileList(@Param("entity") DriveSchoolFile driveSchoolFile, Page<DriveSchoolFile> page);
+    public List<DriveSchoolFile> selectDriveSchoolFileListAll(@Param("entity") DriveSchoolFile driveSchoolFile);
 
     /**
      * 新增文件类型

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInfoMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo;
 import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -30,7 +33,7 @@ public interface DriveSchoolInfoMapper
      * @param driveSchoolInfo 驾校信息
      * @return 驾校信息集合
      */
-    public List<DriveSchoolInfo> selectDriveSchoolInfoList(DriveSchoolInfo driveSchoolInfo);
+    public IPage<DriveSchoolInfo> selectDriveSchoolInfoList(@Param("entity") DriveSchoolInfo driveSchoolInfo, Page<DriveSchoolInfo> page);
 
     /**
      * 新增驾校信息

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolInsuranceMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolInsurance;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolInsuranceMapper
      * @param driveSchoolInsurance 保险管理
      * @return 保险管理集合
      */
-    public List<DriveSchoolInsurance> selectDriveSchoolInsuranceList(DriveSchoolInsurance driveSchoolInsurance);
+    public IPage<DriveSchoolInsurance> selectDriveSchoolInsuranceList(@Param("entity") DriveSchoolInsurance driveSchoolInsurance, Page<DriveSchoolInsurance> page);
 
     /**
      * 新增保险管理

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNewsMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolNews;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,8 @@ public interface DriveSchoolNewsMapper
      * @param driveSchoolNews 校内新闻
      * @return 校内新闻集合
      */
-    public List<DriveSchoolNews> selectDriveSchoolNewsList(DriveSchoolNews driveSchoolNews);
+    public IPage<DriveSchoolNews> selectDriveSchoolNewsList(@Param("entity") DriveSchoolNews driveSchoolNews, Page<DriveSchoolNews> page);
+    public List<DriveSchoolNews> selectDriveSchoolNewsListAll(@Param("entity") DriveSchoolNews driveSchoolNews);
 
     /**
      * 新增校内新闻

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolNoticeMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolNotice;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,8 @@ public interface DriveSchoolNoticeMapper
      * @param driveSchoolNotice 通知
      * @return 通知集合
      */
-    public List<DriveSchoolNotice> selectDriveSchoolNoticeList(DriveSchoolNotice driveSchoolNotice);
+    public IPage<DriveSchoolNotice> selectDriveSchoolNoticeList(@Param("entity") DriveSchoolNotice driveSchoolNotice, Page<DriveSchoolNotice> page);
+    public List<DriveSchoolNotice> selectDriveSchoolNoticeListAll(@Param("entity") DriveSchoolNotice driveSchoolNotice);
 
     /**
      * 新增通知

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolPhoneMapper.java

@@ -2,7 +2,11 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolPhone;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tencentcloudapi.waf.v20180125.models.IpAccessControlData;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +33,7 @@ public interface DriveSchoolPhoneMapper
      * @param driveSchoolPhone 客服
      * @return 客服集合
      */
-    public List<DriveSchoolPhone> selectDriveSchoolPhoneList(DriveSchoolPhone driveSchoolPhone);
+    public IPage<DriveSchoolPhone> selectDriveSchoolPhoneList(@Param("entity") DriveSchoolPhone driveSchoolPhone, Page<DriveSchoolPhone> page);
 
     /**
      * 新增客服

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReimbursementMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolReimbursement;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,7 @@ public interface DriveSchoolReimbursementMapper
      * @param driveSchoolReimbursement 报销审核
      * @return 报销审核集合
      */
-    public List<DriveSchoolReimbursement> selectDriveSchoolReimbursementList(DriveSchoolReimbursement driveSchoolReimbursement);
+    public IPage<DriveSchoolReimbursement> selectDriveSchoolReimbursementList(@Param("entity") DriveSchoolReimbursement driveSchoolReimbursement, Page<DriveSchoolReimbursement> page);
 
     /**
      * 新增报销审核

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReservationCourseMapper.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolReservationCourse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -30,7 +32,7 @@ public interface DriveSchoolReservationCourseMapper
      * @param driveSchoolReservationCourse 预约练车
      * @return 预约练车集合
      */
-    public List<DriveSchoolReservationCourse> selectDriveSchoolReservationCourseList(DriveSchoolReservationCourse driveSchoolReservationCourse);
+    public IPage<DriveSchoolReservationCourse> selectDriveSchoolReservationCourseList(@Param("entity") DriveSchoolReservationCourse driveSchoolReservationCourse, Page<DriveSchoolReservationCourse> page);
 
     /**
      * 新增预约练车

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSeparateMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolSeparate;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,7 @@ public interface DriveSchoolSeparateMapper
      * @param driveSchoolSeparate 驾校分账
      * @return 驾校分账集合
      */
-    public List<DriveSchoolSeparate> selectDriveSchoolSeparateList(DriveSchoolSeparate driveSchoolSeparate);
+    public IPage<DriveSchoolSeparate> selectDriveSchoolSeparateList(@Param("entity") DriveSchoolSeparate driveSchoolSeparate, Page<DriveSchoolSeparate> page);
 
     /**
      * 新增驾校分账

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolTextMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.mapper;
 
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolText;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,7 @@ public interface DriveSchoolTextMapper
      * @param driveSchoolText 驾校公告
      * @return 驾校公告集合
      */
-    public List<DriveSchoolText> selectDriveSchoolTextList(DriveSchoolText driveSchoolText);
+    public IPage<DriveSchoolText> selectDriveSchoolTextList(@Param("entity") DriveSchoolText driveSchoolText, Page<DriveSchoolText> page);
 
     /**
      * 新增驾校公告

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolUpkeepMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolUpkeep;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface DriveSchoolUpkeepMapper
      * @param driveSchoolUpkeep 车辆保养记录
      * @return 车辆保养记录集合
      */
-    public List<DriveSchoolUpkeep> selectDriveSchoolUpkeepList(DriveSchoolUpkeep driveSchoolUpkeep);
+    public IPage<DriveSchoolUpkeep> selectDriveSchoolUpkeepList(@Param("entity") DriveSchoolUpkeep driveSchoolUpkeep, Page<DriveSchoolUpkeep> page);
 
     /**
      * 新增车辆保养记录

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/SopeNessMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.jx.mapper;
 
 import cn.iocoder.yudao.module.jx.domain.SopeNess;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ public interface SopeNessMapper
      * @param sopeNess 经营范围
      * @return 经营范围集合
      */
-    public List<SopeNess> selectSopeNessList(SopeNess sopeNess);
+    public IPage<SopeNess> selectSopeNessList(@Param("entity") SopeNess sopeNess, Page<SopeNess> page);
 
     /**
      * 新增经营范围

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/api/DriveSchoolPayController.java

@@ -0,0 +1,242 @@
+package cn.iocoder.yudao.module.jx.payment.api;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.jx.core.controller.BaseController;
+import cn.iocoder.yudao.module.jx.domain.DriveSchoolCoach;
+import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCoachMapper;
+import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolPay;
+import cn.iocoder.yudao.module.jx.payment.service.DriveSchoolPayService;
+import cn.iocoder.yudao.module.jx.payment.vo.PayVo;
+import cn.iocoder.yudao.module.jx.service.IDriveSchoolInfoService;
+import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 订单Controller
+ *
+ * @author ruoyi
+ * @date 2024-04-24
+ */
+@RestController
+@RequestMapping("/admin-api/system/pay")
+public class DriveSchoolPayController extends BaseController
+{
+    @Autowired
+    private DriveSchoolPayService driveSchoolPayService;
+    @Autowired
+    private IDriveSchoolInfoService driveSchoolInfoService;
+
+    @Resource
+    private AdminUserApi userApi;
+
+
+    @GetMapping("updatePayById")
+    public void updatePayById(Integer id, String name, Integer jlId) {
+        driveSchoolPayService.updatePayById(id, name, jlId);
+    }
+
+
+    /**
+     * 查询订单列表
+     */
+    @GetMapping("/list")
+    public CommonResult<IPage<?>> list(DriveSchoolPay driveSchoolPay)
+    {
+
+        int number = 0;
+        int numbers = 0;
+        int allNumber = 0;
+        DriveSchoolInfoVO schoolInfo = driveSchoolInfoService.getSchoolInfoByDeptId();
+
+        if (schoolInfo != null) {
+            driveSchoolPay.setJxId(schoolInfo.getId());
+        }
+
+        Page<DriveSchoolPay> page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize());
+        IPage<DriveSchoolPay> driveSchoolPayIPage = driveSchoolPayService.selectDriveSchoolPayList(driveSchoolPay, page);
+        List<DriveSchoolPay> list = driveSchoolPayIPage.getRecords();
+        for (DriveSchoolPay row :list) {
+            numbers += 1;
+            allNumber = (driveSchoolPay.getPageNum()-1) * driveSchoolPay.getPageSize();
+            number = allNumber + numbers;
+            String formattedNumber = String.format("%05d", number);
+            row.setSorNumber(formattedNumber);
+        }
+        return CommonResult.success(driveSchoolPayIPage);
+    }
+
+    /**
+     * 查询订单列表
+     */
+    @GetMapping("/stuList")
+    public CommonResult<IPage<?>> stuList(DriveSchoolPay driveSchoolPay)
+    {
+        Page<DriveSchoolPay> page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize());
+        IPage<DriveSchoolPay> driveSchoolPayIPage = driveSchoolPayService.stuList(driveSchoolPay, page);
+        return CommonResult.success(driveSchoolPayIPage);
+    }
+
+
+//    @Resource
+//    private SysUserMapper sysUserMapper;
+
+    @Resource
+    private DriveSchoolCoachMapper driveSchoolCoachMapper;
+
+    /**
+     * 查询订单列表
+     */
+    @GetMapping("/stuListByCoachId")
+    public CommonResult<IPage<?>> stuListByCoachId(DriveSchoolPay driveSchoolPay)
+    {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserRespDTO sysUser = userApi.getUser(userId);
+        String phonenumber = sysUser.getMobile();
+//        Long userId = SecurityUtils.getUserId();
+//        SysUser sysUser = sysUserMapper.selectUserById(userId);
+//        String phonenumber = sysUser.getPhonenumber();
+        DriveSchoolCoach driveSchoolCoach = driveSchoolCoachMapper.selectByPhonenumber(phonenumber);
+        Long jlId = 0L;
+        if (ObjectUtils.isNotEmpty(driveSchoolCoach)){
+            jlId= driveSchoolCoach.getId();
+        }
+        driveSchoolPay.setJlId(jlId);
+        Page<DriveSchoolPay> page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize());
+        IPage<DriveSchoolPay> driveSchoolPayIPage = driveSchoolPayService.stuListByCoachId(driveSchoolPay, page);
+        return CommonResult.success(driveSchoolPayIPage);
+    }
+
+
+    /**
+     * 导出订单列表
+     */
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, DriveSchoolPay driveSchoolPay)
+//    {
+//        List<DriveSchoolPay> list = driveSchoolPayService.selectDriveSchoolPayList(driveSchoolPay);
+//        ExcelUtil<DriveSchoolPay> util = new ExcelUtil<DriveSchoolPay>(DriveSchoolPay.class);
+//        util.exportExcel(response, list, "订单数据");
+//    }
+
+    /**
+     * 导入学员信息
+     */
+//    @PostMapping("/exportIn")
+//    public void exportIn(HttpServletResponse response, DriveSchoolPay driveSchoolPay)
+//    {
+//        List<DriveSchoolPay> list = driveSchoolPayService.selectDriveSchoolPayList(driveSchoolPay);
+//        ExcelUtil<DriveSchoolPay> util = new ExcelUtil<DriveSchoolPay>(DriveSchoolPay.class);
+//        util.exportExcel(response, list, "订单数据");
+//    }
+
+
+
+//    @PostMapping("/importData")
+//    public CommonResult importData(MultipartFile file, boolean updateSupport) throws Exception
+//    {
+//        ExcelUtil<DriveSchoolPay> util = new ExcelUtil<DriveSchoolPay>(DriveSchoolPay.class);
+//        List<DriveSchoolPay> userList = util.importExcel(file.getInputStream());
+//        String operName = getUsername();
+//        String message = driveSchoolPayService.importUser(userList, updateSupport, operName);
+//        return success(message);
+//    }
+
+
+    /**
+     * 获取订单详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public CommonResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(driveSchoolPayService.selectDriveSchoolPayById(id));
+    }
+
+    /**
+     * 获取订单详细信息
+     */
+    @GetMapping(value = "/getInfoByUserId/{userId}")
+    public CommonResult getInfoByUserId(@PathVariable("userId") Long userId)
+    {
+        return success(driveSchoolPayService.getInfoByUserId(userId));
+    }
+
+    /**
+     * 获取订单详细信息
+     */
+    @GetMapping(value = "/getInfoByUserIndenty/{userId}")
+    public CommonResult getInfoByUserIndenty(@PathVariable("userId") String userId)
+    {
+        return success(driveSchoolPayService.getInfoByUserIndenty(userId));
+    }
+
+    /**
+     * 新增订单
+     */
+    @PostMapping
+    public CommonResult add(@RequestBody DriveSchoolPay driveSchoolPay)
+    {
+        return toAjax(driveSchoolPayService.insertDriveSchoolPay(driveSchoolPay));
+    }
+
+    /**
+     * 修改订单
+     */
+    @PutMapping
+    public CommonResult edit(@RequestBody DriveSchoolPay driveSchoolPay)
+    {
+        return toAjax(driveSchoolPayService.updateDriveSchoolPay(driveSchoolPay));
+    }
+
+    /**
+     * 删除订单
+     */
+    @DeleteMapping("/{ids}")
+    public CommonResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(driveSchoolPayService.deleteDriveSchoolPayByIds(ids));
+    }
+
+    /**
+     * 学员详情-报名课程接口
+     */
+    @GetMapping("/applet/getReportCourseList")
+    public CommonResult<IPage<?>> getReportCourseList(DriveSchoolPay driveSchoolPay)
+    {
+        Page<DriveSchoolPay> page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize());
+        IPage<DriveSchoolPay> reportCourseList = driveSchoolPayService.getReportCourseList(driveSchoolPay, page);
+        return CommonResult.success(reportCourseList);
+    }
+
+    /**
+     * 学员详情列表
+     */
+    @GetMapping("/applet/getUserList")
+    public CommonResult<IPage<?>> getUserList(DriveSchoolPay driveSchoolPay)
+    {
+        Page<DriveSchoolPay> page = new Page<>(driveSchoolPay.getPageNum(), driveSchoolPay.getPageSize());
+        IPage<DriveSchoolPay> userList = driveSchoolPayService.getUserList(driveSchoolPay, page);
+        return CommonResult.success(userList);
+    }
+
+    /**
+     * 返回教练提成金额
+     */
+    @GetMapping("/getDeductByUserInfo")
+    public CommonResult getDeductByUserInfo(DriveSchoolPay driveSchoolPay)
+    {
+        PayVo payVo = driveSchoolPayService.getDeductByUserInfo(driveSchoolPay);
+
+        return CommonResult.success(payVo);
+    }
+
+}

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolBooking.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.jx.payment.entity;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -16,7 +16,7 @@ import java.util.Date;
  * @date 2024-04-25
  */
 @Data
-public class DriveSchoolBooking extends BaseEntity
+public class DriveSchoolBooking extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/DriveSchoolPay.java

@@ -1,19 +1,16 @@
 package cn.iocoder.yudao.module.jx.payment.entity;
 
 import cn.iocoder.yudao.annotation.Excel;
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 import java.util.Date;
 
 
 @Data
-public class DriveSchoolPay extends BaseEntity
+public class DriveSchoolPay extends TenantBaDO
 {
     private static final long serialVersionUID = 1L;
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/entity/commentVo.java

@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.jx.payment.entity;
 
-import cn.iocoder.yudao.module.jx.core.page.BaseEntity;
+import cn.iocoder.yudao.module.jx.core.page.TenantBaDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
-public class commentVo extends BaseEntity {
+public class commentVo extends TenantBaDO {
     private String commentDesc;
     private Integer commentStar;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/mapper/DriveSchoolBookingMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.jx.payment.mapper;
 
 
 import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolBooking;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +32,7 @@ public interface DriveSchoolBookingMapper
      * @param driveSchoolBooking 预约
      * @return 预约集合
      */
-    public List<DriveSchoolBooking> selectDriveSchoolBookingList(DriveSchoolBooking driveSchoolBooking);
+    public IPage<DriveSchoolBooking> selectDriveSchoolBookingList(@Param("entity") DriveSchoolBooking driveSchoolBooking, Page<DriveSchoolBooking> page);
     public List<DriveSchoolBooking> listByUser(DriveSchoolBooking driveSchoolBooking);
 
     /**