Merge remote-tracking branch 'origin/dev' into dev

dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.order.vo;
 
-import cn.iocoder.yudao.module.company.entity.Company;
 import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -11,9 +10,15 @@ import lombok.Data;
 @ExcelIgnoreUnannotated
 public class RepairOrderInfoRespVO extends RepairOrderInfo {
 
-    /** 订单状态（工单的状态） */
+    /** 订单状态（工单的维修子状态） */
     private String status;
 
+    /** 订单状态（工单的主状态） */
+    private String mainStatus;
+
     //订单描述
     private String description;
+
+    /** 查询订单类型(null-所有 |working-维修中|waitingPay-待支付|waitingComment-待评价) */
+    private String selectType;
 }

dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml

@@ -21,7 +21,8 @@
                type,
                status,
                parent_server,
-               server
+               server,
+               create_time
         from dl_base_notice dbn
         where dbn.deleted = '0'
     </sql>

dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml

@@ -39,7 +39,9 @@
     </select>
 
     <select id="getOrderPageByStatus" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO">
-        select roi.*,drt.tickets_work_status as status from repair_order_info roi left join dl_repair_tickets drt on
+        select roi.*,drt.tickets_work_status as status,drt.tickets_status as mainStatus
+        from repair_order_info roi
+        left join dl_repair_tickets drt on
         roi.goods_id = drt.id
         where roi.deleted = '0'
         <if test="map.userId != null and map.userId != ''">
@@ -51,6 +53,22 @@
         <if test="map.orderStatus != null  and map.orderStatus != ''">
             and roi.order_status = #{map.orderStatus}
         </if>
+        <if test="map.selectType != null and map.selectType != ''">
+            <choose>
+                <when test="map.selectType == 'working'">
+                    --    维修中的订单   --
+                and (drt.tickets_status = '04' OR drt.tickets_status = '05' )
+                </when>
+                <when test="map.selectType == 'waitingPay'">
+                    --    待支付的订单   --
+                and (roi.pay_type is not null AND roi.order_status='0' )
+                </when>
+                <when test="map.selectType == 'waitingComment'">
+                    --    待评价的订单   --
+                and (roi.comment_star is null AND roi.order_status='1' )
+                </when>
+            </choose>
+        </if>
         <if test="map.status != null and map.status != ''">
             <choose>
                 <when test="map.status != '00'">

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java

@@ -9,15 +9,17 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.appBase.entity.AppSwiper;
 import cn.iocoder.yudao.module.appBase.service.IAppSwiperService;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.infra.controller.app.file.vo.AppFileUploadReqVO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
 import cn.iocoder.yudao.module.shop.service.IShopMallPartnersService;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import cn.iocoder.yudao.util.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -71,11 +73,13 @@ public class AppSwiperController extends BaseController
      */
 
     @GetMapping("/system/appSwiper/list")
-    public TableDataInfo list(AppSwiper appSwiper)
+    public CommonResult list(AppSwiper appSwiper,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<AppSwiper> page = new Page<>(pageNum, pageSize);
-        List<AppSwiper> list = appSwiperService.selectAppSwiperList(appSwiper);
+        IPage<AppSwiper> list = appSwiperService.selectAppSwiperList(page,appSwiper);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -83,11 +87,14 @@ public class AppSwiperController extends BaseController
      */
 
     @PostMapping("/system/appSwiper/export")
-    public void export(HttpServletResponse response, AppSwiper appSwiper)
+    public void export(HttpServletResponse response, AppSwiper appSwiper,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<AppSwiper> list = appSwiperService.selectAppSwiperList(appSwiper);
+        Page<AppSwiper> page = new Page<>(pageNum, pageSize);
+        IPage<AppSwiper> list = appSwiperService.selectAppSwiperList(page,appSwiper);
         ExcelUtil<AppSwiper> util = new ExcelUtil<AppSwiper>(AppSwiper.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+        util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/mapper/AppSwiperMapper.java

@@ -1,8 +1,11 @@
 package cn.iocoder.yudao.module.appBase.mapper;
 
 import cn.iocoder.yudao.module.appBase.entity.AppSwiper;
+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 org.checkerframework.checker.units.qual.A;
 
 import java.util.List;
 
@@ -30,7 +33,7 @@ public interface AppSwiperMapper
      * @param appSwiper 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<AppSwiper> selectAppSwiperList(@Param("vo") AppSwiper appSwiper);
+    public IPage<AppSwiper> selectAppSwiperList(Page<AppSwiper> page, @Param("vo") AppSwiper appSwiper);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/IAppSwiperService.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.appBase.service;
 
 import cn.iocoder.yudao.module.appBase.entity.AppSwiper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -26,7 +28,7 @@ public interface IAppSwiperService
      * @param appSwiper 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<AppSwiper> selectAppSwiperList(AppSwiper appSwiper);
+    public IPage<AppSwiper> selectAppSwiperList(Page<AppSwiper> page, AppSwiper appSwiper);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/AppSwiperServiceImpl.java

@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.appBase.service.impl;
 import cn.iocoder.yudao.module.appBase.entity.AppSwiper;
 import cn.iocoder.yudao.module.appBase.service.IAppSwiperService;
 import cn.iocoder.yudao.module.appBase.mapper.AppSwiperMapper;
+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.stereotype.Service;
 
@@ -39,9 +41,9 @@ public class AppSwiperServiceImpl implements IAppSwiperService
      * @return 【请填写功能名称】
      */
     @Override
-    public List<AppSwiper> selectAppSwiperList(AppSwiper appSwiper)
+    public IPage<AppSwiper> selectAppSwiperList(Page<AppSwiper> page, AppSwiper appSwiper)
     {
-        return appSwiperMapper.selectAppSwiperList(appSwiper);
+        return appSwiperMapper.selectAppSwiperList(page,appSwiper);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/ContractHistoryController.java

@@ -12,13 +12,14 @@ import cn.iocoder.yudao.module.contract.entity.InspectionContract;
 import cn.iocoder.yudao.module.contract.service.IContractHistoryService;
 import cn.iocoder.yudao.module.contract.service.IInspectionContractService;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import cn.iocoder.yudao.util.ExcelUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import org.dom4j.DocumentException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,11 +59,13 @@ public class ContractHistoryController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:history:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ContractHistory contractHistory,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize)
+    public CommonResult list(ContractHistory contractHistory,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        PageHelper.startPage(pageNum,pageSize);
+        Page<ContractHistory> page = new Page<>(pageNum, pageSize);
-        List<ContractHistory> list = contractHistoryService.selectContractHistoryList(contractHistory);
+        IPage<ContractHistory> list = contractHistoryService.selectContractHistoryList(page,contractHistory);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -71,11 +74,14 @@ public class ContractHistoryController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('system:history:export')")
 
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ContractHistory contractHistory)
+    public void export(HttpServletResponse response, ContractHistory contractHistory,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<ContractHistory> list = contractHistoryService.selectContractHistoryList(contractHistory);
+        Page<ContractHistory> page = new Page<>(pageNum, pageSize);
+        IPage<ContractHistory> list = contractHistoryService.selectContractHistoryList(page,contractHistory);
         ExcelUtil<ContractHistory> util = new ExcelUtil<ContractHistory>(ContractHistory.class);
-        util.exportExcel(response, list, "签署历史数据");
+        util.exportExcel(response, list.getRecords(), "签署历史数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/controller/InspectionContractController.java

@@ -4,10 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.contract.entity.InspectionContract;
 import cn.iocoder.yudao.module.contract.service.IInspectionContractService;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
 import cn.iocoder.yudao.util.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.*;
@@ -34,11 +36,13 @@ public class InspectionContractController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('contract:inspectionContract:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionContract inspectionContract)
+    public CommonResult list(InspectionContract inspectionContract,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionContract> page = new Page<>(pageNum, pageSize);
-        List<InspectionContract> list = inspectionContractService.selectInspectionContractList(inspectionContract);
+        IPage<InspectionContract> list = inspectionContractService.selectInspectionContractList(page,inspectionContract);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -47,11 +51,14 @@ public class InspectionContractController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('contract:inspectionContract:export')")
 //    @Log(title = "inspectionContract", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionContract inspectionContract)
+    public void export(HttpServletResponse response, InspectionContract inspectionContract,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionContract> list = inspectionContractService.selectInspectionContractList(inspectionContract);
+        Page<InspectionContract> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionContract> list = inspectionContractService.selectInspectionContractList(page,inspectionContract);
         ExcelUtil<InspectionContract> util = new ExcelUtil<InspectionContract>(InspectionContract.class);
-        util.exportExcel(response, list, "inspectionContract数据");
+        util.exportExcel(response, list.getRecords(), "inspectionContract数据");
     }
 
     /**
@@ -103,11 +110,13 @@ public class InspectionContractController extends BaseController
      */
 
     @GetMapping("/partnerGetWtList")
-    public TableDataInfo partnerGetWtList(InspectionContract inspectionContract) throws Exception {
+    public CommonResult partnerGetWtList(InspectionContract inspectionContract,
+                                         @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) throws Exception {
         ShopMallPartners partners = partnerList.shopInfo();
         inspectionContract.setPartnerId(partners.getPartnerId());
-        startPage();
+        Page<InspectionContract> page = new Page<>(pageNum, pageSize);
-        List<InspectionContract> list = inspectionContractService.partnerGetWtList(inspectionContract);
+        IPage<InspectionContract> list = inspectionContractService.partnerGetWtList(page,inspectionContract);
-        return getDataTable(list);
+        return success(list);
     }
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/ContractHistoryMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.contract.mapper;
 
 import cn.iocoder.yudao.module.contract.entity.ContractHistory;
 import cn.iocoder.yudao.module.contract.entity.InspectionContract;
+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 ContractHistoryMapper
      * @param contractHistory 签署历史
      * @return 签署历史集合
      */
-    public List<ContractHistory> selectContractHistoryList(ContractHistory contractHistory);
+    public IPage<ContractHistory> selectContractHistoryList(Page<ContractHistory> page, @Param("vo") ContractHistory contractHistory);
 
     /**
      * 新增签署历史
@@ -63,6 +66,6 @@ public interface ContractHistoryMapper
      */
     public int deleteContractHistoryByIds(Long[] ids);
 
-    public List<InspectionContract> partnerGetWtList(InspectionContract contractHistory);
+    public IPage<InspectionContract> partnerGetWtList(Page<InspectionContract> page, @Param("vo") InspectionContract contractHistory);
 
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/mapper/InspectionContractMapper.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.contract.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.contract.entity.InspectionContract;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -29,7 +31,7 @@ public interface InspectionContractMapper  extends BaseMapper<InspectionContract
      * @param inspectionContract inspectionContract
      * @return inspectionContract集合
      */
-    public List<InspectionContract> selectInspectionContractList(InspectionContract inspectionContract);
+    public IPage<InspectionContract> selectInspectionContractList(Page<InspectionContract> page, InspectionContract inspectionContract);
 
     /**
      * 新增inspectionContract

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IContractHistoryService.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.contract.service;
 
 import cn.iocoder.yudao.module.contract.entity.ContractHistory;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -26,7 +28,7 @@ public interface IContractHistoryService
      * @param contractHistory 签署历史
      * @return 签署历史集合
      */
-    public List<ContractHistory> selectContractHistoryList(ContractHistory contractHistory);
+    public IPage<ContractHistory> selectContractHistoryList(Page<ContractHistory> page, ContractHistory contractHistory);
 
     /**
      * 新增签署历史

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/IInspectionContractService.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.contract.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.contract.entity.InspectionContract;
 
@@ -27,7 +29,7 @@ public interface IInspectionContractService  extends IService<InspectionContract
      * @param inspectionContract inspectionContract
      * @return inspectionContract集合
      */
-    public List<InspectionContract> selectInspectionContractList(InspectionContract inspectionContract);
+    public IPage<InspectionContract> selectInspectionContractList(Page<InspectionContract> page, InspectionContract inspectionContract);
 
     /**
      * 新增inspectionContract
@@ -60,5 +62,5 @@ public interface IInspectionContractService  extends IService<InspectionContract
      * @return 结果
      */
     public int deleteInspectionContractById(Long id);
-    List<InspectionContract> partnerGetWtList(InspectionContract inspectionContract);
+    IPage<InspectionContract> partnerGetWtList(Page<InspectionContract> page, InspectionContract inspectionContract);
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/ContractHistoryServiceImpl.java

@@ -4,6 +4,8 @@ import cn.iocoder.yudao.util.DateUtils;
 import cn.iocoder.yudao.module.contract.entity.ContractHistory;
 import cn.iocoder.yudao.module.contract.mapper.ContractHistoryMapper;
 import cn.iocoder.yudao.module.contract.service.IContractHistoryService;
+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.stereotype.Service;
 
@@ -40,9 +42,9 @@ public class ContractHistoryServiceImpl implements IContractHistoryService
      * @return 签署历史
      */
     @Override
-    public List<ContractHistory> selectContractHistoryList(ContractHistory contractHistory)
+    public IPage<ContractHistory> selectContractHistoryList(Page<ContractHistory> page, ContractHistory contractHistory)
     {
-        return contractHistoryMapper.selectContractHistoryList(contractHistory);
+        return contractHistoryMapper.selectContractHistoryList(page,contractHistory);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/contract/service/impl/InspectionContractServiceImpl.java

@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.contract.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
 import cn.iocoder.yudao.module.contract.entity.InspectionContract;
 import cn.iocoder.yudao.module.contract.mapper.ContractHistoryMapper;
 import cn.iocoder.yudao.module.contract.mapper.InspectionContractMapper;
 import cn.iocoder.yudao.module.contract.service.IInspectionContractService;
+
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -42,9 +45,9 @@ public class InspectionContractServiceImpl extends ServiceImpl<InspectionContrac
      * @return inspectionContract
      */
     @Override
-    public List<InspectionContract> selectInspectionContractList(InspectionContract inspectionContract)
+    public IPage<InspectionContract> selectInspectionContractList(Page<InspectionContract> page, InspectionContract inspectionContract)
     {
-        return baseMapper.selectInspectionContractList(inspectionContract);
+        return baseMapper.selectInspectionContractList(page,inspectionContract);
     }
 
     /**
@@ -97,8 +100,8 @@ public class InspectionContractServiceImpl extends ServiceImpl<InspectionContrac
     }
 
     @Override
-    public List<InspectionContract> partnerGetWtList(InspectionContract inspectionContract) {
+    public IPage<InspectionContract> partnerGetWtList(Page<InspectionContract> page,InspectionContract inspectionContract) {
-        return contractHistoryMapper.partnerGetWtList(inspectionContract);
+        return contractHistoryMapper.partnerGetWtList(page,inspectionContract);
     }
 
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java

@@ -4,11 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.appBase.entity.AppSwiper;
 import cn.iocoder.yudao.module.appBase.service.IAppSwiperService;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionGoodsService;
 import cn.iocoder.yudao.module.inspection.service.IInspectionNewsService;
 import cn.iocoder.yudao.module.inspection.vo.PartnerListVo;
+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.annotation.Resource;
@@ -41,9 +42,12 @@ public class AppHomeController extends BaseController {
      */
     @GetMapping("/listSwiper")
     @TenantIgnore
-    public CommonResult listSwiper(AppSwiper appSwiper)
+    public CommonResult listSwiper(AppSwiper appSwiper,
+                                   @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<AppSwiper> list = appSwiperService.selectAppSwiperList(appSwiper);
+        Page<AppSwiper> page = new Page<>(pageNum, pageSize);
+        IPage<AppSwiper> list = appSwiperService.selectAppSwiperList(page,appSwiper);
         return success(list);
     }
 
@@ -66,11 +70,13 @@ public class AppHomeController extends BaseController {
      */
     @GetMapping("/homePartner")
     @TenantIgnore
-    public TableDataInfo homePartner(Double longitude, Double latitude)
+    public CommonResult homePartner(Double longitude, Double latitude,
+                                     @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<PartnerListVo> page = new Page<>(pageNum, pageSize);
-        List<PartnerListVo> list = shopInspectionGoodsService.homePartner(longitude,latitude);
+        IPage<PartnerListVo> list = shopInspectionGoodsService.homePartner(page,longitude,latitude);
-        return getDataTable(list);
+        return success(list);
     }
 }
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppNewsController.java

@@ -16,10 +16,11 @@ import cn.iocoder.yudao.module.system.service.dict.DictDataService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import cn.iocoder.yudao.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.github.pagehelper.PageHelper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment;
 import cn.iocoder.yudao.module.inspection.service.IInspectionNewsCommentService;
@@ -105,22 +106,24 @@ public class AppNewsController extends BaseController {
         return success(list);
     }
     @GetMapping("/list")
-    public TableDataInfo list(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(InspectionNews inspectionNews,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<InspectionNews> page = new Page<>(pageNum, pageSize);
-        List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
+        IPage<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
-        return getDataTable(list);
+        return success(list);
     }
 
     @GetMapping("/ownList")
-    public TableDataInfo ownList(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult ownList(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
     {
         //当前登录用户
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         inspectionNews.setCreator(loginUser.getId().toString());
         Page<InspectionNews> page = new Page<>(pageNum, pageSize);
-        List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
+        IPage<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
-        return getDataTable(list);
+        return success(list);
     }
     @PostMapping("/add")
     public CommonResult add(@RequestBody InspectionNews inspectionNews) throws Exception {
@@ -263,25 +266,29 @@ public class AppNewsController extends BaseController {
      * @return
      */
     @GetMapping("/getCommentList")
-    public TableDataInfo getCommentList(Long newsId)
+    public CommonResult getCommentList(Long newsId,
+                                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
 
-        startPage();
+        Page<InspectionNewsComment> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<InspectionNewsComment> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(InspectionNewsComment::getNewsId,newsId).orderByDesc(TenantBaseDO::getCreateTime);
-        List<InspectionNewsComment> commentList = commentService.list(queryWrapper);
+        IPage<InspectionNewsComment> commentList = commentService.page(page,queryWrapper);
-        return getDataTable(commentList);
+        return success(commentList);
     }
     /**
      * 我的收藏
      * @return
      */
     @GetMapping("/collectionNews")
-    public TableDataInfo collectionNews(String newsName)
+    public CommonResult collectionNews(String newsName,
+                                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionNews> page = new Page<>(pageNum, pageSize);
-        List<InspectionNews> newsList = inspectionNewsService.collectionNews(newsName);
+        IPage<InspectionNews> newsList = inspectionNewsService.collectionNews(page,newsName);
-        return getDataTable(newsList);
+        return success(newsList);
     }
 
     /**
@@ -299,11 +306,13 @@ public class AppNewsController extends BaseController {
      * @return
      */
     @GetMapping("/msgList")
-    public TableDataInfo msgList(Long partnerId,Integer pageNum,Integer pageSize)
+    public CommonResult msgList(Long partnerId,
+                                @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        PageHelper.startPage(pageNum,pageSize);
+        Page<InspectionNews> page = new Page<>(pageNum, pageSize);
-        List<InspectionNews> news = inspectionNewsService.msgList(partnerId);
+        IPage<InspectionNews> news = inspectionNewsService.msgList(page,partnerId);
-        return getDataTable(news);
+        return success(news);
     }
 
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java

@@ -4,16 +4,14 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.payment.entity.OrderInfo;
 import cn.iocoder.yudao.module.payment.service.OrderInfoService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.entity.InspectionInfo;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -27,10 +25,12 @@ public class AppOrderController extends BaseController {
 
     @GetMapping("/orderList")
     @TenantIgnore
-    public TableDataInfo orderList(String status, String title, Integer pageNum, Integer pageSize) {
+    public CommonResult orderList(String status, String title,
-        PageHelper.startPage(pageNum, pageSize);
+                                  @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
-        List<OrderInfo> orderInfos = orderInfoService.orderListApp(status, title, "jc");
+                                  @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
-        return getDataTable(orderInfos);
+        Page<OrderInfo> page = new Page<>(pageNum, pageSize);
+        IPage<OrderInfo> orderInfos = orderInfoService.orderListApp(page, status, title, "jc");
+        return success(orderInfos);
     }
     @GetMapping("/orderDetail")
     public CommonResult orderDetail(Long orderId) {
@@ -39,10 +39,12 @@ public class AppOrderController extends BaseController {
     //获取检测的数据
     @GetMapping("/inspectionList")
     @TenantIgnore
-    public TableDataInfo inspectionList(String status,Integer pageNum,Integer pageSize) {
+    public CommonResult inspectionList(String status,
-        PageHelper.startPage(pageNum,pageSize);
+                                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
-        List<InspectionInfo> inspectionInfos = appInspectionOrderService.inspectionList(status);
+                                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
-        return getDataTable(inspectionInfos);
+        Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionInfo> inspectionInfos = appInspectionOrderService.inspectionList(page,status);
+        return success(inspectionInfos);
     }
 
     //获取检测的详细信息
@@ -87,10 +89,12 @@ public class AppOrderController extends BaseController {
 
     //政府部门获取检测的数据
     @GetMapping("/governmentInspectionList")
-    public TableDataInfo governmentInspectionList(String carNum,String status,String partnerId,Integer pageNum,Integer pageSize) {
+    public CommonResult governmentInspectionList(String carNum,String status,String partnerId,
-        PageHelper.startPage(pageNum,pageSize);
+                                                 @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
-        List<InspectionInfo> inspectionInfos = appInspectionOrderService.governmentInspectionList(carNum,status,partnerId);
+                                                 @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
-        return getDataTable(inspectionInfos);
+        Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionInfo> inspectionInfos = appInspectionOrderService.governmentInspectionList(page,carNum,status,partnerId);
+        return success(inspectionInfos);
     }
 
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java

@@ -6,12 +6,13 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.query.PartnerListQuery;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
 import cn.iocoder.yudao.module.inspection.vo.PartnerListVo;
 import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
 import cn.iocoder.yudao.module.shop.service.IPartnerDetailService;
+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;
@@ -29,11 +30,13 @@ public class AppPartnerController extends BaseController {
      */
     @GetMapping("/list")
     @TenantIgnore
-    public TableDataInfo partnerList(PartnerListQuery partnerListQuery)
+    public CommonResult partnerList(PartnerListQuery partnerListQuery,
+                                    @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<PartnerListVo> page = new Page<>(pageNum, pageSize);
-        List<PartnerListVo> list = partnerList.partnerList(partnerListQuery);
+        IPage<PartnerListVo> list = partnerList.partnerList(page,partnerListQuery);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java

@@ -7,9 +7,11 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.github.pagehelper.PageHelper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.service.AppUserOwnService;
 import cn.iocoder.yudao.module.shop.entity.ShopUserCar;
 import cn.iocoder.yudao.module.shop.service.IShopUserCarService;
@@ -54,11 +56,13 @@ public class AppUserOwnController extends BaseController {
     }
 
     @GetMapping("/getDbList")
-    public TableDataInfo getDbList(String searchValue, Integer pageSize, Integer pageNum)
+    public CommonResult getDbList(String searchValue,
+                                  @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        PageHelper.startPage(pageNum,pageSize);
+        Page<AdminUserDO> page = new Page<>(pageNum, pageSize);
-        List<AdminUserDO> dbList = ownService.getDbList(searchValue);
+        IPage<AdminUserDO> dbList = ownService.getDbListTow(page,searchValue);
-        return getDataTable(dbList);
+        return success(dbList);
     }
 
     @GetMapping(value = "/getAppUserCar")

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/DelInspectionInfoController.java

@@ -7,18 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo;
 import cn.iocoder.yudao.module.inspection.service.IDelInspectionInfoService;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
@@ -38,11 +32,13 @@ public class DelInspectionInfoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:info:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DelInspectionInfo delInspectionInfo)
+    public CommonResult list(DelInspectionInfo delInspectionInfo,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<DelInspectionInfo> page = new Page<>(pageNum, pageSize);
-        List<DelInspectionInfo> list = delInspectionInfoService.selectDelInspectionInfoList(delInspectionInfo);
+        IPage<DelInspectionInfo> list = delInspectionInfoService.selectDelInspectionInfoList(page,delInspectionInfo);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -50,11 +46,14 @@ public class DelInspectionInfoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:info:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DelInspectionInfo delInspectionInfo)
+    public void export(HttpServletResponse response, DelInspectionInfo delInspectionInfo,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<DelInspectionInfo> list = delInspectionInfoService.selectDelInspectionInfoList(delInspectionInfo);
+        Page<DelInspectionInfo> page = new Page<>(pageNum, pageSize);
+        IPage<DelInspectionInfo> list = delInspectionInfoService.selectDelInspectionInfoList(page,delInspectionInfo);
         ExcelUtil<DelInspectionInfo> util = new ExcelUtil<DelInspectionInfo>(DelInspectionInfo.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+        util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java

@@ -8,11 +8,12 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.inspection.entity.InspectionAppointment;
 import cn.iocoder.yudao.module.inspection.service.IInspectionAppointmentService;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
@@ -32,11 +33,13 @@ public class InspectionAppointmentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:appointment:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionAppointment inspectionAppointment)
+    public CommonResult list(InspectionAppointment inspectionAppointment,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionAppointment> page = new Page<>(pageNum, pageSize);
-        List<InspectionAppointment> list = inspectionAppointmentService.selectInspectionAppointmentList(inspectionAppointment);
+        IPage<InspectionAppointment> list = inspectionAppointmentService.selectInspectionAppointmentList(page,inspectionAppointment);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -44,11 +47,14 @@ public class InspectionAppointmentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:appointment:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionAppointment inspectionAppointment)
+    public void export(HttpServletResponse response, InspectionAppointment inspectionAppointment,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionAppointment> list = inspectionAppointmentService.selectInspectionAppointmentList(inspectionAppointment);
+        Page<InspectionAppointment> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionAppointment> list = inspectionAppointmentService.selectInspectionAppointmentList(page,inspectionAppointment);
         ExcelUtil<InspectionAppointment> util = new ExcelUtil<InspectionAppointment>(InspectionAppointment.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+        util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionCategoryTemplateController.java

@@ -5,22 +5,15 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate;
 import cn.iocoder.yudao.module.inspection.service.IInspectionCategoryTemplateService;
 
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
-
 /**
  * 分类模版Controller
  *
@@ -39,11 +32,13 @@ public class InspectionCategoryTemplateController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('inspection:template:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionCategoryTemplate inspectionCategoryTemplate)
+    public CommonResult list(InspectionCategoryTemplate inspectionCategoryTemplate,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionCategoryTemplate> page = new Page<>(pageNum, pageSize);
-        List<InspectionCategoryTemplate> list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(inspectionCategoryTemplate);
+        IPage<InspectionCategoryTemplate> list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(page,inspectionCategoryTemplate);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -51,11 +46,14 @@ public class InspectionCategoryTemplateController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('inspection:template:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionCategoryTemplate inspectionCategoryTemplate)
+    public void export(HttpServletResponse response, InspectionCategoryTemplate inspectionCategoryTemplate,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionCategoryTemplate> list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(inspectionCategoryTemplate);
+        Page<InspectionCategoryTemplate> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionCategoryTemplate> list = inspectionCategoryTemplateService.selectInspectionCategoryTemplateList(page,inspectionCategoryTemplate);
         ExcelUtil<InspectionCategoryTemplate> util = new ExcelUtil<InspectionCategoryTemplate>(InspectionCategoryTemplate.class);
-        util.exportExcel(response, list, "分类模版数据");
+        util.exportExcel(response, list.getRecords(), "分类模版数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java

@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo;
 import cn.iocoder.yudao.module.inspection.service.IInspectionEquInfoService;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * equInfoController

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java

@@ -1,23 +1,18 @@
 package cn.iocoder.yudao.module.inspection.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
-import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
-import cn.iocoder.yudao.util.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
+import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
 import cn.iocoder.yudao.module.inspection.service.IInspectionFileService;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
+import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
+import cn.iocoder.yudao.util.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;
 
 /**
  * inspectionFileController
@@ -38,27 +33,32 @@ public class InspectionFileController extends BaseController
      * 查询inspectionFile列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(InspectionFile inspectionFile) throws Exception {
+    public CommonResult list(InspectionFile inspectionFile,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) throws Exception {
         ShopMallPartners partners = partnerService.shopInfoByUserId();
         inspectionFile.setPartnerId(partners.getPartnerId());
 
-        startPage();
+        Page<InspectionFile> page = new Page<>(pageNum, pageSize);
 
         // 使用MyBatis-Plus的分页查询，将结果转换为Page对象
-        List<InspectionFile> list = inspectionFileService.selectInspectionFileList(inspectionFile);
+        IPage<InspectionFile> list = inspectionFileService.selectInspectionFileList(page,inspectionFile);
 
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
      * 导出inspectionFile列表
      */
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionFile inspectionFile)
+    public void export(HttpServletResponse response, InspectionFile inspectionFile,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionFile> list = inspectionFileService.selectInspectionFileList(inspectionFile);
+        Page<InspectionFile> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionFile> list = inspectionFileService.selectInspectionFileList(page,inspectionFile);
         ExcelUtil<InspectionFile> util = new ExcelUtil<InspectionFile>(InspectionFile.class);
-        util.exportExcel(response, list, "inspectionFile数据");
+        util.exportExcel(response, list.getRecords(), "inspectionFile数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionGoodsSkuController.java

@@ -3,9 +3,10 @@ package cn.iocoder.yudao.module.inspection.controller;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.entity.InspectionGoodsSku;
 import cn.iocoder.yudao.module.inspection.service.InspectionGoodsSkuService;
+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 java.util.List;
@@ -32,10 +33,12 @@ public class InspectionGoodsSkuController extends BaseController {
      * @return 所有数据
      */
     @GetMapping("/list")
-    public TableDataInfo selectAll(InspectionGoodsSku inspectionGoodsSku) {
+    public CommonResult selectAll(InspectionGoodsSku inspectionGoodsSku,
-        startPage();
+                                  @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
-        List<InspectionGoodsSku> resList = this.inspectionGoodsSkuService.list(new QueryWrapper<>(inspectionGoodsSku));
+                                  @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
-        return getDataTable(resList);
+        Page<InspectionGoodsSku> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionGoodsSku> resList = this.inspectionGoodsSkuService.page(page,new QueryWrapper<>(inspectionGoodsSku));
+        return success(resList);
     }
 
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java

@@ -7,11 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.inspection.entity.InspectionInfo;
 import cn.iocoder.yudao.module.inspection.service.IInspectionInfoService;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
@@ -31,11 +32,13 @@ public class InspectionInfoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:info:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionInfo inspectionInfo)
+    public CommonResult list(InspectionInfo inspectionInfo,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
-        List<InspectionInfo> list = inspectionInfoService.selectInspectionInfoList(inspectionInfo);
+        IPage<InspectionInfo> list = inspectionInfoService.selectInspectionInfoList(page,inspectionInfo);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -43,11 +46,14 @@ public class InspectionInfoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:info:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionInfo inspectionInfo)
+    public void export(HttpServletResponse response, InspectionInfo inspectionInfo,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionInfo> list = inspectionInfoService.selectInspectionInfoList(inspectionInfo);
+        Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionInfo> list = inspectionInfoService.selectInspectionInfoList(page,inspectionInfo);
         ExcelUtil<InspectionInfo> util = new ExcelUtil<InspectionInfo>(InspectionInfo.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+        util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java

@@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.util.StringUtils;
 import cn.iocoder.yudao.module.inspection.entity.InspectionInfo;
 import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
@@ -66,12 +65,14 @@ public class InspectionMallPartnersController extends BaseController {
      * 查询合作商管理列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(ShopMallPartners shopMallPartners,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(ShopMallPartners shopMallPartners,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         shopMallPartners.setType("jc");
         Page<ShopMallPartners> page = new Page<>(pageNum, pageSize);
-        List<ShopMallPartners> list = shopMallPartnersService.selectShopMallPartnersList(page,shopMallPartners);
+        IPage<ShopMallPartners> list = shopMallPartnersService.selectShopMallPartnersList(page,shopMallPartners);
-        return getDataTable(list);
+        return success(list);
     }
 
 
@@ -79,13 +80,16 @@ public class InspectionMallPartnersController extends BaseController {
      * 查询合作商管理列表
      */
     @GetMapping("/listComment")
-    public TableDataInfo listComment(Long partnerId,Integer pageSize,Integer pageNum)
+    public CommonResult listComment(Long partnerId,
+                                    @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
+        Page<OrderInfo> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<OrderInfo> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.select(OrderInfo::getGoodsTitle,OrderInfo::getCommentDesc,OrderInfo::getCommentTime,OrderInfo::getCommentStar,OrderInfo::getRealName,OrderInfo::getId).eq(OrderInfo::getPartnerId,partnerId).orderByDesc(OrderInfo::getCommentTime).isNotNull(OrderInfo::getCommentTime);
-        PageHelper.startPage(pageNum,pageSize);
+
-        List<OrderInfo> list = orderInfoService.list(queryWrapper);
+        IPage<OrderInfo> list = orderInfoService.page(page,queryWrapper);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsAssociationController.java

@@ -7,18 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation;
 import cn.iocoder.yudao.module.inspection.service.IInspectionNewsAssociationService;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
@@ -38,11 +32,13 @@ public class InspectionNewsAssociationController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:association:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionNewsAssociation inspectionNewsAssociation)
+    public CommonResult list(InspectionNewsAssociation inspectionNewsAssociation,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionNewsAssociation> page = new Page<>(pageNum, pageSize);
-        List<InspectionNewsAssociation> list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(inspectionNewsAssociation);
+        IPage<InspectionNewsAssociation> list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(page,inspectionNewsAssociation);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -50,11 +46,14 @@ public class InspectionNewsAssociationController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:association:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionNewsAssociation inspectionNewsAssociation)
+    public void export(HttpServletResponse response, InspectionNewsAssociation inspectionNewsAssociation,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionNewsAssociation> list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(inspectionNewsAssociation);
+        Page<InspectionNewsAssociation> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionNewsAssociation> list = inspectionNewsAssociationService.selectInspectionNewsAssociationList(page,inspectionNewsAssociation);
         ExcelUtil<InspectionNewsAssociation> util = new ExcelUtil<InspectionNewsAssociation>(InspectionNewsAssociation.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+        util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsCommentController.java

@@ -7,18 +7,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment;
 import cn.iocoder.yudao.module.inspection.service.IInspectionNewsCommentService;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
@@ -38,11 +32,13 @@ public class InspectionNewsCommentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:comment:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionNewsComment inspectionNewsComment)
+    public CommonResult list(InspectionNewsComment inspectionNewsComment,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionNewsComment> page = new Page<>(pageNum, pageSize);
-        List<InspectionNewsComment> list = inspectionNewsCommentService.selectInspectionNewsCommentList(inspectionNewsComment);
+        IPage<InspectionNewsComment> list = inspectionNewsCommentService.selectInspectionNewsCommentList(page,inspectionNewsComment);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -50,11 +46,14 @@ public class InspectionNewsCommentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:comment:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionNewsComment inspectionNewsComment)
+    public void export(HttpServletResponse response, InspectionNewsComment inspectionNewsComment,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionNewsComment> list = inspectionNewsCommentService.selectInspectionNewsCommentList(inspectionNewsComment);
+        Page<InspectionNewsComment> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionNewsComment> list = inspectionNewsCommentService.selectInspectionNewsCommentList(page,inspectionNewsComment);
         ExcelUtil<InspectionNewsComment> util = new ExcelUtil<InspectionNewsComment>(InspectionNewsComment.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+        util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsController.java

@@ -6,12 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
 import cn.iocoder.yudao.module.inspection.service.IInspectionNewsService;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
@@ -31,11 +31,13 @@ public class InspectionNewsController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:news:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(InspectionNews inspectionNews,
+                              @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                              @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<InspectionNews> page = new Page<>(pageNum, pageSize);
-        List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
+        IPage<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionPickCarController.java

@@ -5,20 +5,14 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.inspection.entity.InspectionPickCar;
 import cn.iocoder.yudao.module.inspection.service.IInspectionPickCarService;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 
 /**
  * 上门取车服务Controller
@@ -38,11 +32,13 @@ public class InspectionPickCarController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('inspection:pickCar:list')")
     @GetMapping("/list")
-    public TableDataInfo list(InspectionPickCar inspectionPickCar)
+    public CommonResult list(InspectionPickCar inspectionPickCar,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<InspectionPickCar> page = new Page<>(pageNum, pageSize);
-        List<InspectionPickCar> list = inspectionPickCarService.selectInspectionPickCarList(inspectionPickCar);
+        IPage<InspectionPickCar> list = inspectionPickCarService.selectInspectionPickCarList(page,inspectionPickCar);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -50,11 +46,14 @@ public class InspectionPickCarController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('inspection:pickCar:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InspectionPickCar inspectionPickCar)
+    public void export(HttpServletResponse response, InspectionPickCar inspectionPickCar,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<InspectionPickCar> list = inspectionPickCarService.selectInspectionPickCarList(inspectionPickCar);
+        Page<InspectionPickCar> page = new Page<>(pageNum, pageSize);
+        IPage<InspectionPickCar> list = inspectionPickCarService.selectInspectionPickCarList(page,inspectionPickCar);
         ExcelUtil<InspectionPickCar> util = new ExcelUtil<InspectionPickCar>(InspectionPickCar.class);
-        util.exportExcel(response, list, "上门取车服务数据");
+        util.exportExcel(response, list.getRecords(), "上门取车服务数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java

@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.entity.*;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
 import cn.iocoder.yudao.module.inspection.vo.GoodsVo;
@@ -85,9 +84,9 @@ public class PartnerOwnController  extends BaseController {
      * 首页 顶部数据统计
      */
     @GetMapping("/statisticsInfo")
-    public CommonResult statisticsInfo(Long partnerId)
+    public CommonResult statisticsInfo()
     {
-        return   success(partnerList.statisticsInfo(partnerId));
+        return   success(partnerList.statisticsInfo(null));
     }
     /**
      * 检测线图
@@ -173,16 +172,18 @@ public class PartnerOwnController  extends BaseController {
      * 商品管理列表
      */
     @GetMapping("/goodsList")
-    public TableDataInfo goodsList(Long partnerId,String isListing,String goodsTitle,Integer pageNum,Integer pageSize)
+    public CommonResult goodsList(Long partnerId,String isListing,String goodsTitle,
+                                  @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         ShopMallPartners partners = partnerList.getById(partnerId);
         if (!partners.getUserId().equals(user.getId())){
             return null;
         }
-        PageHelper.startPage(pageNum, pageSize);
+        Page<GoodsVo> page = new Page<>(pageNum, pageSize);
-        List<GoodsVo> list = partnerList.goodsList(partnerId, isListing, goodsTitle);
+        IPage<GoodsVo> list = partnerList.goodsList(page,partnerId, isListing, goodsTitle);
-        return getDataTable(list);
+        return success(list);
     }
     /**
      * 商品管理列表
@@ -267,25 +268,30 @@ public class PartnerOwnController  extends BaseController {
      * 店铺账户信息
      */
     @GetMapping("/accountDetail")
-    public TableDataInfo accountDetail(Long partnerId, Integer pageNum, Integer pageSize)
+    public CommonResult accountDetail(Long partnerId,
+                                      @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        List<PartnerBalanceDetail> details = partnerList.accountDetail(partnerId,pageNum,pageSize);
+        Page<PartnerBalanceDetail> page = new Page<>(pageNum, pageSize);
-        return   getDataTable(details);
+        IPage<PartnerBalanceDetail> details = partnerList.accountDetail(page,partnerId,pageNum,pageSize);
+        return success(details);
     }
     /**
      * 当前店铺的订单信息
      */
     @GetMapping("/orderList")
-    public TableDataInfo orderList(Long partnerId,String phoneNum, String title, Integer pageNum, Integer pageSize)
+    public CommonResult orderList(Long partnerId,String phoneNum, String title,
+                                  @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         ShopMallPartners partnersTmp = partnerList.getById(partnerId);
         if (!partnersTmp.getUserId().equals(user.getId())){
             return null;
         }
-        PageHelper.startPage(pageNum, pageSize);
+        Page<OrderAppDetail> page = new Page<>(pageNum, pageSize);
-        List<OrderAppDetail> orderInfos = partnerList.orderList(partnerId,phoneNum, title);
+        IPage<OrderAppDetail> orderInfos = partnerList.orderList(page,partnerId,phoneNum, title);
-        return getDataTable(orderInfos);
+        return success(orderInfos);
     }
     /**
      * 通过核销码获取订单信息
@@ -430,15 +436,17 @@ public class PartnerOwnController  extends BaseController {
 
     // 核销记录By核销人Id
     @GetMapping("/validationList")
-    public TableDataInfo validationList(Long partnerId,String searchValue,Integer pageNum,Integer pageSize) {
+    public CommonResult validationList(Long partnerId,String searchValue,
+                                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         ShopMallPartners partnersTmp = partnerList.getById(partnerId);
         if (!partnersTmp.getUserId().equals(user.getId())){
             return null;
         }
-        PageHelper.startPage(pageNum,pageSize);
+        Page<OrderInfo> page = new Page<>(pageNum, pageSize);
-        List<OrderInfo> orderInfos = partnerList.validationList(partnerId,searchValue);
+        IPage<OrderInfo> orderInfos = partnerList.validationList(page,partnerId,searchValue);
-        return getDataTable(orderInfos);
+        return success(orderInfos);
     }
 
     //送券功能
@@ -450,15 +458,17 @@ public class PartnerOwnController  extends BaseController {
 
     //优惠券列表
     @GetMapping("/listCoupon")
-    public TableDataInfo listCoupon(Long partnerId,String searchValue,Integer pageNum,Integer pageSize){
+    public CommonResult listCoupon(Long partnerId,String searchValue,
+                                   @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize){
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         ShopMallPartners partnersTmp = partnerList.getById(partnerId);
         if (!partnersTmp.getUserId().equals(user.getId())){
-            return getDataTable(new ArrayList<>());
+            return success(new ArrayList<>());
         }
-        PageHelper.startPage(pageNum,pageSize);
+        Page<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
-        List<ShopCouponTemplate> shopCouponTemplates = partnerList.listCoupon(partnerId, searchValue);
+        IPage<ShopCouponTemplate> shopCouponTemplates = partnerList.listCoupon(page,partnerId, searchValue);
-        return getDataTable(shopCouponTemplates);
+        return success(shopCouponTemplates);
     }
     //删除优惠券
     @PostMapping("/delCoupon")
@@ -476,7 +486,9 @@ public class PartnerOwnController  extends BaseController {
 
     //获取上门取车数据
     @GetMapping("/getPickCarListOfWorker")
-    public TableDataInfo getPickCarListOfWorker(Long partnerId,String phoneNum,Integer pageSize,Integer pageNum) {
+    public CommonResult getPickCarListOfWorker(Long partnerId,String phoneNum,
+                                               @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         LambdaQueryWrapper<PartnerWorker> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(PartnerWorker::getUserId,user.getId()).eq(PartnerWorker::getPartnerId,partnerId);
@@ -484,9 +496,9 @@ public class PartnerOwnController  extends BaseController {
         if (ObjectUtil.isEmpty(worker)){
             return null;
         }
-        PageHelper.startPage(pageNum,pageSize);
+        Page<InspectionPickCar> page = new Page<>(pageNum, pageSize);
-        List<InspectionPickCar> pickCarList = partnerList.getPickCarListOfWorker(worker.getId(),phoneNum);
+        IPage<InspectionPickCar> pickCarList = partnerList.getPickCarListOfWorker(page,worker.getId(),phoneNum);
-        return getDataTable(pickCarList);
+        return success(pickCarList);
     }
 
     //获取客户来源

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionCategoryController.java

@@ -4,11 +4,11 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
 import cn.iocoder.yudao.module.inspection.service.ShopInspectionCategoryService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionGoodsController.java

@@ -23,7 +23,6 @@ import cn.iocoder.yudao.module.payment.entity.OrderInfo;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -32,7 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods;
 import cn.iocoder.yudao.module.inspection.service.IShopInspectionGoodsService;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
+
 
 /**
  * 检测商品Controller
@@ -63,23 +62,27 @@ public class ShopInspectionGoodsController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:inspectionGoods:list')")
     @GetMapping("/listSystem")
-    public TableDataInfo listSystem(ShopInspectionGoods shopInspectionGoods,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult listSystem(ShopInspectionGoods shopInspectionGoods,
+                                   @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<ShopInspectionGoods> page = new Page<>(pageNum, pageSize);
-        List<ShopInspectionGoods> list = shopInspectionGoodsService.listSystem(page,shopInspectionGoods);
+        IPage<ShopInspectionGoods> list = shopInspectionGoodsService.listSystem(page,shopInspectionGoods);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
      * 查询检测商品列表
      */
     @GetMapping("/listPartnerGoods")
-    public TableDataInfo listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception {
+    public CommonResult listPartnerGoods(ShopInspectionGoods shopInspectionGoods,
+                                         @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) throws Exception {
         ShopMallPartners one = appInspectionPartnerService.shopInfoByUserId();
         shopInspectionGoods.setPartnerId(one.getPartnerId().intValue());
-        startPage();
+        Page<ShopInspectionGoods> page = new Page<>(pageNum, pageSize);
-        List<ShopInspectionGoods> list = shopInspectionGoodsService.listPartnerGoods(shopInspectionGoods);
+        IPage<ShopInspectionGoods> list = shopInspectionGoodsService.listPartnerGoods(page,shopInspectionGoods);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -256,11 +259,13 @@ public class ShopInspectionGoodsController extends BaseController
     }
 
     @GetMapping("/listWx")
-    public TableDataInfo listWx(ShopInspectionGoods shopInspectionGoods)
+    public CommonResult listWx(ShopInspectionGoods shopInspectionGoods,
+                               @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                               @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        startPage();
+        Page<ShopInspectionGoods> page = new Page<>(pageNum, pageSize);
-        List<ShopInspectionGoods> list = shopInspectionGoodsService.selectShopInspectionGoodsListWx(shopInspectionGoods);
+        IPage<ShopInspectionGoods> list = shopInspectionGoodsService.selectShopInspectionGoodsListWx(page,shopInspectionGoods);
-        return getDataTable(list);
+        return success(list);
     }
     /**
      * 获取检测商品详细信息

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java

@@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.inspection.entity.NweUsers;
 import cn.iocoder.yudao.util.ExcelUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.inspection.entity.SiteInfo;
 import cn.iocoder.yudao.module.inspection.service.ISiteInfoService;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
+
 
 /**
  * inspectionController
@@ -39,11 +40,11 @@ public class SiteInfoController extends BaseController
      */
     @GetMapping("/list")
     @TenantIgnore
-    public TableDataInfo list(SiteInfo siteInfo, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(SiteInfo siteInfo, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize)
     {
         Page<SiteInfo> page = new Page<>(pageNum, pageSize);
-        List<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
+        IPage<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -51,12 +52,14 @@ public class SiteInfoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('inspection:info:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SiteInfo siteInfo)
+    public void export(HttpServletResponse response, SiteInfo siteInfo,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<SiteInfo> page = new Page<>();
-        List<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
+        IPage<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
         ExcelUtil<SiteInfo> util = new ExcelUtil<SiteInfo>(SiteInfo.class);
-        util.exportExcel(response, list, "inspection数据");
+        util.exportExcel(response, list.getRecords(), "inspection数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionGoodsMapper.java

@@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.inspection.query.GoodsQuery;
 import cn.iocoder.yudao.module.inspection.vo.GoodsVo;
 import cn.iocoder.yudao.module.inspection.vo.HomeGoodsVo;
 import cn.iocoder.yudao.module.inspection.vo.PartnerListVo;
+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;
 
@@ -19,7 +21,7 @@ import java.util.List;
  */
 @Mapper
 public interface AppInspectionGoodsMapper extends BaseMapper<ShopInspectionGoods> {
-    List<PartnerListVo> homePartners(@Param("longitude") Double longitude, @Param("latitude")Double latitude);
+    IPage<PartnerListVo> homePartners(Page<PartnerListVo> page, @Param("longitude") Double longitude, @Param("latitude")Double latitude);
     List<GoodsVo> goodsList(GoodsQuery goodsQuery);
 }
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java

@@ -20,7 +20,7 @@ import java.util.Map;
 @Mapper
 public interface AppInspectionPartnerMapper extends BaseMapper<ShopMallPartners> {
     ShopMallPartners selectById(@Param("id") Long id);
-    List<PartnerListVo> partnerList(PartnerListQuery partnerListQuery);
+    IPage<PartnerListVo> partnerList(Page<PartnerListVo> page, @Param("vo") PartnerListQuery partnerListQuery);
     PartnerListVo shopDetail(PartnerListQuery partnerListQuery);
     void addSalesNum(@Param("partnerId") Long partnerId);
     StatisticsInfo workNum(@Param("partnerId") Long partnerId,@Param("timeStr") String timeStr);
@@ -32,15 +32,15 @@ public interface AppInspectionPartnerMapper extends BaseMapper<ShopMallPartners>
     Integer allAmount(@Param("partnerId") Long partnerId);
     Integer  todayAmount(@Param("partnerId") Long partnerId,@Param("timeStr") String timeStr);
     List<HotGoodsVo> hotGoodsList(@Param("partnerId") Long partnerId,@Param("dateStr")String dateStr);
-    List<GoodsVo> manageGoodsList(@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle);
+    IPage<GoodsVo> manageGoodsList(Page<GoodsVo> page,@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle);
-    List<OrderAppDetail> orderList(@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title);
+    IPage<OrderAppDetail> orderList(Page<OrderAppDetail> page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title);
     List<PartnerWorker> getWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum);
     IPage<PartnerWorker> pageWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum,Page<LabelRespVO> page);
     IPage<InspectionInfo> inspectionList(Page<InspectionInfo> page,@Param("partnerId")Long partnerId, @Param("status") String status, @Param("carNum")String carNum);
     List<InspectionInfo> workerInspectionList(@Param("workerId")Long workerId,@Param("status") String status, @Param("searchValue")String searchValue);
-    List<OrderInfo> validationList(@Param("partnerId") Long partnerId, @Param("searchValue") String searchValue);
+    IPage<OrderInfo> validationList(Page<OrderInfo> page, @Param("partnerId") Long partnerId, @Param("searchValue") String searchValue);
     IPage<InspectionPickCar> getPickCarList(Page page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum, @Param("pickStatus") String pickStatus);
-    List<InspectionPickCar> getPickCarListOfWorker(@Param("workerId") Long workerId, @Param("phoneNum") String phoneNum);
+    IPage<InspectionPickCar> getPickCarListOfWorker(Page<InspectionPickCar> page,@Param("workerId") Long workerId, @Param("phoneNum") String phoneNum);
 
     List<OrderInfo> chartInfoAmount(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("partnerId")Long partnerId);
     List<OrderInfo> chartInfoNum(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("partnerId")Long partnerId);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/DelInspectionInfoMapper.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.inspection.mapper;
 
 import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo;
+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 DelInspectionInfoMapper
      * @param delInspectionInfo 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<DelInspectionInfo> selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo);
+    public IPage<DelInspectionInfo> selectDelInspectionInfoList(Page<DelInspectionInfo> page,@Param("vo") DelInspectionInfo delInspectionInfo);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionAppointmentMapper.java

@@ -32,7 +32,7 @@ public interface InspectionAppointmentMapper extends BaseMapper<InspectionAppoin
      * @param inspectionAppointment 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionAppointment> selectInspectionAppointmentList(InspectionAppointment inspectionAppointment);
+    public IPage<InspectionAppointment> selectInspectionAppointmentList(Page<InspectionAppointment> page, @Param("vo") InspectionAppointment inspectionAppointment);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionCategoryTemplateMapper.java

@@ -5,7 +5,10 @@ import java.util.List;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate;
+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;
 
 /**
  * 分类模版Mapper接口
@@ -30,7 +33,7 @@ public interface InspectionCategoryTemplateMapper  extends BaseMapperX<Inspectio
      * @param inspectionCategoryTemplate 分类模版
      * @return 分类模版集合
      */
-    public List<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate);
+    public IPage<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(Page<InspectionCategoryTemplate> page, @Param("vo") InspectionCategoryTemplate inspectionCategoryTemplate);
 
     /**
      * 新增分类模版

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileMapper.java

@@ -4,7 +4,10 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
+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;
 
 /**
  * inspectionFileMapper接口
@@ -29,6 +32,6 @@ public interface InspectionFileMapper  extends BaseMapper<InspectionFile>
      * @param inspectionFile inspectionFile
      * @return inspectionFile集合
      */
-    public List<InspectionFile> selectInspectionFileList(InspectionFile inspectionFile);
+    public IPage<InspectionFile> selectInspectionFileList(Page<InspectionFile> page, @Param("vo") InspectionFile inspectionFile);
 
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionInfoMapper.java

@@ -34,7 +34,7 @@ public interface InspectionInfoMapper  extends BaseMapper<InspectionInfo>
      * @param inspectionInfo 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionInfo> selectInspectionInfoList(InspectionInfo inspectionInfo);
+    public IPage<InspectionInfo> selectInspectionInfoList(Page<InspectionInfo> page,@Param("vo") InspectionInfo inspectionInfo);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsAssociationMapper.java

@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.inspection.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation;
+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 InspectionNewsAssociationMapper extends BaseMapper<InspectionNe
      * @param inspectionNewsAssociation 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionNewsAssociation> selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation);
+    public IPage<InspectionNewsAssociation> selectInspectionNewsAssociationList(Page<InspectionNewsAssociation> page, @Param("vo") InspectionNewsAssociation inspectionNewsAssociation);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsCommentMapper.java

@@ -5,7 +5,10 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment;
+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;
 
 
 /**
@@ -31,7 +34,7 @@ public interface InspectionNewsCommentMapper  extends BaseMapper<InspectionNewsC
      * @param inspectionNewsComment 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionNewsComment> selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment);
+    public IPage<InspectionNewsComment> selectInspectionNewsCommentList(Page<InspectionNewsComment> page, @Param("vo") InspectionNewsComment inspectionNewsComment);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsMapper.java

@@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.inspection.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
+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;
 
@@ -31,7 +33,7 @@ public interface InspectionNewsMapper extends BaseMapper<InspectionNews>
      * @param inspectionNews 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, @Param("vo") InspectionNews inspectionNews);
+    public IPage<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, @Param("vo") InspectionNews inspectionNews);
 
     /**
      * 新增【请填写功能名称】
@@ -77,8 +79,8 @@ public interface InspectionNewsMapper extends BaseMapper<InspectionNews>
 
     //新增阅读数量
     void addReadNum(Long id);
-    List<InspectionNews> collectionNews(@Param("userId") Long userId,@Param("newsName")String newsName);
+    IPage<InspectionNews> collectionNews(Page<InspectionNews> page, @Param("userId") Long userId,@Param("newsName")String newsName);
     Integer newMsgNum(@Param("partnerId") Long partnerId);
-    List<InspectionNews> msgList(@Param("partnerId") Long partnerId);
+    IPage<InspectionNews> msgList(Page<InspectionNews> page, @Param("partnerId") Long partnerId);
     List<String> listGfClass(@Param("type") String type);
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionPickCarMapper.java

@@ -4,7 +4,10 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.InspectionPickCar;
+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;
 
 /**
  * 上门取车服务Mapper接口
@@ -29,7 +32,7 @@ public interface InspectionPickCarMapper  extends BaseMapper<InspectionPickCar>
      * @param inspectionPickCar 上门取车服务
      * @return 上门取车服务集合
      */
-    public List<InspectionPickCar> selectInspectionPickCarList(InspectionPickCar inspectionPickCar);
+    public IPage<InspectionPickCar> selectInspectionPickCarList(Page<InspectionPickCar> page, @Param("vo") InspectionPickCar inspectionPickCar);
 
     /**
      * 新增上门取车服务

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/ShopInspectionGoodsMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods;
+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;
@@ -31,10 +32,10 @@ public interface ShopInspectionGoodsMapper extends BaseMapper<ShopInspectionGood
      * @param shopInspectionGoods 检测商品
      * @return 检测商品集合
      */
-    public List<ShopInspectionGoods> selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods);
+    public IPage<ShopInspectionGoods> selectShopInspectionGoodsListWx(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
 
-    List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
+    IPage<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
-    List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods);
+    IPage<ShopInspectionGoods> listPartnerGoods(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
 
 
     int deleteByList(List<Long> list);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/SiteInfoMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import cn.iocoder.yudao.module.inspection.entity.NweUsers;
 import cn.iocoder.yudao.module.inspection.entity.SiteInfo;
 import com.alibaba.fastjson.JSONObject;
+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;
@@ -32,7 +33,7 @@ public interface SiteInfoMapper
      * @param siteInfo inspection
      * @return inspection集合
      */
-    public List<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,@Param("vo") SiteInfo siteInfo);
+    public IPage<SiteInfo> selectSiteInfoList(Page<SiteInfo> page, @Param("vo") SiteInfo siteInfo);
 
     /**
      * 新增inspection

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionGoodsService.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.inspection.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.InspectionGoodsSku;
 import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
@@ -17,7 +19,7 @@ import java.util.List;
  */
 public interface AppInspectionGoodsService extends IService<ShopInspectionGoods> {
 
-    List<PartnerListVo> homePartner(Double longitude, Double latitude);
+    IPage<PartnerListVo> homePartner(Page<PartnerListVo> page, Double longitude, Double latitude);
     List<ShopInspectionCategory>  categoryList();
     List<GoodsVo> goodsList(GoodsQuery goodsQuery);
     GoodsDetail goodsDetail(GoodsQuery goodsQuery);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionOrderService.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.inspection.vo.InspectionInfoVo;
 import cn.iocoder.yudao.module.inspection.vo.OrderAppDetail;
 import cn.iocoder.yudao.module.payment.entity.OrderInfo;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
@@ -15,7 +17,7 @@ import java.util.List;
 public interface AppInspectionOrderService extends IService<OrderInfo> {
     OrderAppDetail orderDetailApp(Long orderId);
 
-   List<InspectionInfo> inspectionList(String status);
+   IPage<InspectionInfo> inspectionList(Page<InspectionInfo> page, String status);
     InspectionInfoVo inspectionDetail(Long inspectionInfoId);
     JSONObject statisticsTop();
     List<JSONObject>  statisticsMid();
@@ -23,7 +25,7 @@ public interface AppInspectionOrderService extends IService<OrderInfo> {
     List<JSONObject> statisticsOrder();
     List<JSONObject> getPartnerList(String partnerName);
 
-    List<InspectionInfo> governmentInspectionList(String carNum,String status,String partnerId);
+    IPage<InspectionInfo> governmentInspectionList(Page<InspectionInfo> page, String carNum,String status,String partnerId);
 
 
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java

@@ -21,7 +21,7 @@ import java.util.Map;
 
 
 public interface AppInspectionPartnerService extends IService<ShopMallPartners> {
-   List<PartnerListVo> partnerList(PartnerListQuery partnerListQuery);
+   IPage<PartnerListVo> partnerList(Page<PartnerListVo> page, PartnerListQuery partnerListQuery);
    List<ShopInspectionCategory> categoryList(Long partnerId);
    PartnerListVo shopDetail(PartnerListQuery partnerListQuery);
    void addSalesNum(Long partnerId);
@@ -46,7 +46,7 @@ public interface AppInspectionPartnerService extends IService<ShopMallPartners>
    List<OrderInfo> orderInfo(Long partnerId);
    List<HotGoodsVo> hotGoodsList(Long partnerId);
    void addGoods(ShopInspectionGoods goods) throws Exception;
-   List<GoodsVo> goodsList(Long partnerId, String isListing, String goodsTitle);
+   IPage<GoodsVo> goodsList(Page<GoodsVo> page,Long partnerId, String isListing, String goodsTitle);
    List<JSONObject> canUseGoods(Long partnerId);
    ShopInspectionGoods  goodsDetail(Long goodsId);
    void editGoods(ShopInspectionGoods goods) throws Exception;
@@ -57,8 +57,8 @@ public interface AppInspectionPartnerService extends IService<ShopMallPartners>
    void editPartnerInfo(ShopMallPartners partners);
    PartnerVo getPartnerInfo(Long partnerId);
    PartnerBalance accountInfo(Long partnerId);
-   List<PartnerBalanceDetail> accountDetail(Long partnerId, Integer pageNum, Integer pageSize);
+   IPage<PartnerBalanceDetail> accountDetail(Page<PartnerBalanceDetail> page,Long partnerId, Integer pageNum, Integer pageSize);
-    List<OrderAppDetail> orderList(Long partnerId,String phoneNum, String title);
+    IPage<OrderAppDetail> orderList(Page<OrderAppDetail> page,Long partnerId,String phoneNum, String title);
    OrderAppDetail orderDetail(Long partnerId,Long orderId);
    Long   orderDetailByCode(Long partnerId,String code) throws Exception;
     void takeOut(Long partnerId,Long orderId,Long workId,String carNum) throws Exception;
@@ -77,14 +77,14 @@ public interface AppInspectionPartnerService extends IService<ShopMallPartners>
    void stopInspection(InspectionInfo info) throws Exception;
    void makeCertOk(Long inspectionId);
    IPage<InspectionAppointment> getAppointmentList(Page<InspectionAppointment> page,Long partnerId,String phoneNum);
-   List<OrderInfo>  validationList(Long partnerId,String searchValue);
+   IPage<OrderInfo>  validationList(Page<OrderInfo> page,Long partnerId,String searchValue);
    void sendCoupon(ShopCouponTemplate template) throws Exception;
-   List<ShopCouponTemplate> listCoupon(Long partnerId,String searchValue);
+   IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> page,Long partnerId,String searchValue);
    void delCoupon(Long partnerId,Long id);
    void designatePickCarWorker(Long pickCarId,Long workerId);
    IPage<InspectionPickCar> getPickCarList(Page page,Long partnerId, String phoneNum,String pickStatus);
    InspectionPickCar getPickCarDetail(Long dataId);
-   List<InspectionPickCar> getPickCarListOfWorker(Long workerId, String phoneNum);
+   IPage<InspectionPickCar> getPickCarListOfWorker(Page<InspectionPickCar> page,Long workerId, String phoneNum);
    JSONObject vehicleLicenseOCR(String imagePath) throws Exception;
    void offlineCharging(InspectionInfoVo infoVo);
    String workOrderView(Long inspectionId);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppUserOwnService.java

@@ -2,13 +2,17 @@ package cn.iocoder.yudao.module.inspection.service;
 
 import cn.iocoder.yudao.module.shop.entity.ShopUserCar;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import java.util.List;
 
 public interface AppUserOwnService {
     void updateRole(String roleCode);
     List<ShopUserCar> getCars();
     List<ShopUserCar> getCanInspectionCars();
-    List<AdminUserDO> getDbList(String searchValue);
+    List<AdminUserDO> getDbList(Page<AdminUserDO> page, String searchValue);
+    IPage<AdminUserDO> getDbListTow(Page<AdminUserDO> page, String searchValue);
     List<ShopUserCar> getAppUserCar();
     void userCarWarn();
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IDelInspectionInfoService.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.inspection.service;
 
 import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -27,7 +29,7 @@ public interface IDelInspectionInfoService
      * @param delInspectionInfo 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<DelInspectionInfo> selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo);
+    public IPage<DelInspectionInfo> selectDelInspectionInfoList(Page<DelInspectionInfo> page, DelInspectionInfo delInspectionInfo);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionAppointmentService.java

@@ -31,7 +31,7 @@ public interface IInspectionAppointmentService  extends IService<InspectionAppoi
      * @param inspectionAppointment 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionAppointment> selectInspectionAppointmentList(InspectionAppointment inspectionAppointment);
+    public IPage<InspectionAppointment> selectInspectionAppointmentList(Page<InspectionAppointment> page, InspectionAppointment inspectionAppointment);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionCategoryTemplateService.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate;
 
@@ -27,7 +29,7 @@ public interface IInspectionCategoryTemplateService  extends IService<Inspection
      * @param inspectionCategoryTemplate 分类模版
      * @return 分类模版集合
      */
-    public List<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate);
+    public IPage<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(Page<InspectionCategoryTemplate> page, InspectionCategoryTemplate inspectionCategoryTemplate);
 
     /**
      * 新增分类模版

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java

@@ -1,11 +1,9 @@
 package cn.iocoder.yudao.module.inspection.service;
 
-import java.util.List;
+import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
 
 /**
  * inspectionFileService接口
@@ -23,13 +21,6 @@ public interface IInspectionFileService  extends IService<InspectionFile>
      */
     public InspectionFile selectInspectionFileById(Long id);
 
-    /**
-     * 查询inspectionFile列表
-     *
-     * @param inspectionFile inspectionFile
-     * @return inspectionFile集合
-     */
-    public List<InspectionFile> selectInspectionFileList(InspectionFile inspectionFile);
 
     /**
      * 新增inspectionFile

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java

@@ -30,7 +30,7 @@ public interface IInspectionInfoService  extends IService<InspectionInfo>
      * @param inspectionInfo 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionInfo> selectInspectionInfoList(InspectionInfo inspectionInfo);
+    public IPage<InspectionInfo> selectInspectionInfoList(Page<InspectionInfo> page, InspectionInfo inspectionInfo);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsAssociationService.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.inspection.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation;
@@ -29,7 +31,7 @@ public interface IInspectionNewsAssociationService  extends IService<InspectionN
      * @param inspectionNewsAssociation 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionNewsAssociation> selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation);
+    public IPage<InspectionNewsAssociation> selectInspectionNewsAssociationList(Page<InspectionNewsAssociation> page, InspectionNewsAssociation inspectionNewsAssociation);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsCommentService.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.inspection.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment;
 
@@ -27,7 +29,7 @@ public interface IInspectionNewsCommentService extends IService<InspectionNewsCo
      * @param inspectionNewsComment 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionNewsComment> selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment);
+    public IPage<InspectionNewsComment> selectInspectionNewsCommentList(Page<InspectionNewsComment> page, InspectionNewsComment inspectionNewsComment);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsService.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.inspection.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment;
 
+
 import java.util.List;
 
 /**
@@ -30,7 +32,7 @@ public interface IInspectionNewsService extends IService<InspectionNews>
      * @param inspectionNews 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page,InspectionNews inspectionNews);
+    public IPage<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, InspectionNews inspectionNews);
     List<InspectionNews> appHomeNewsList();
     List<String> listGfClass(String type);
 
@@ -84,8 +86,8 @@ public interface IInspectionNewsService extends IService<InspectionNews>
 
     void addReadNum(Long id,Long objectId);
     InspectionNews getDetail(Long newsId);
-    List<InspectionNews> collectionNews(String newsName);
+    IPage<InspectionNews> collectionNews(Page<InspectionNews> page, String newsName);
     Integer newMsgNum(Long partnerId);
-    List<InspectionNews> msgList(Long partnerId);
+    IPage<InspectionNews> msgList(Page<InspectionNews> page, Long partnerId);
 
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionPickCarService.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.InspectionPickCar;
 
@@ -27,7 +29,7 @@ public interface IInspectionPickCarService  extends IService<InspectionPickCar>
      * @param inspectionPickCar 上门取车服务
      * @return 上门取车服务集合
      */
-    public List<InspectionPickCar> selectInspectionPickCarList(InspectionPickCar inspectionPickCar);
+    public IPage<InspectionPickCar> selectInspectionPickCarList(Page<InspectionPickCar> page, InspectionPickCar inspectionPickCar);
 
     /**
      * 新增上门取车服务

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IShopInspectionGoodsService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.inspection.service;
 import java.util.List;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
@@ -38,7 +39,7 @@ public interface IShopInspectionGoodsService extends IService<ShopInspectionGood
      * @param shopInspectionGoods 检测商品
      * @return 检测商品集合
      */
-    public List<ShopInspectionGoods> selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods);
+    public IPage<ShopInspectionGoods> selectShopInspectionGoodsListWx(Page<ShopInspectionGoods> page, ShopInspectionGoods shopInspectionGoods);
 
     /**
      * 新增检测商品
@@ -79,9 +80,9 @@ public interface IShopInspectionGoodsService extends IService<ShopInspectionGood
      * @param shopInspectionGoods 检测商品
      * @return 检测商品集合
      */
-    public List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods);
+    public IPage<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods);
 
-    public List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception;
+    public IPage<ShopInspectionGoods> listPartnerGoods(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) throws Exception;
     List<ShopInspectionCategory> categoryList() throws Exception;
     void partnerAddGoods(ShopInspectionGoods shopInspectionGoods) throws Exception;
     List<ShopInspectionGoods> partnerGoodsListTree(Long partnerId);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/ISiteInfoService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import cn.iocoder.yudao.module.inspection.entity.NweUsers;
 import cn.iocoder.yudao.module.inspection.entity.SiteInfo;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**
@@ -29,7 +30,7 @@ public interface ISiteInfoService
      * @param siteInfo inspection
      * @return inspection集合
      */
-    public List<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,SiteInfo siteInfo);
+    public IPage<SiteInfo> selectSiteInfoList(Page<SiteInfo> page, SiteInfo siteInfo);
 
     /**
      * 新增inspection

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java

@@ -14,6 +14,8 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.StringUtils;
 import cn.iocoder.yudao.module.inspection.entity.InspectionGoodsSku;
@@ -69,9 +71,9 @@ public class AppInspectionGoodsServiceImpl extends ServiceImpl<AppInspectionGood
 
 
     @Override
-    public List<PartnerListVo> homePartner(Double longitude, Double latitude) {
+    public IPage<PartnerListVo> homePartner(Page<PartnerListVo> page, Double longitude, Double latitude) {
-        List<PartnerListVo> partnerListVos = baseMapper.homePartners(longitude,latitude);
+        IPage<PartnerListVo> partnerListVos = baseMapper.homePartners(page,longitude,latitude);
-        partnerListVos.forEach(item->{
+        partnerListVos.getRecords().forEach(item->{
             if (StringUtils.isNotEmpty(item.getAddress())){
                 item.setAddress(item.getAddress().substring(item.getAddress().indexOf("市")+1));
             }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionOrderServiceImpl.java

@@ -21,6 +21,8 @@ import cn.iocoder.yudao.module.inspection.service.*;
 import cn.iocoder.yudao.module.inspection.vo.InspectionInfoVo;
 import cn.iocoder.yudao.module.inspection.vo.OrderAppDetail;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -88,9 +90,9 @@ public class AppInspectionOrderServiceImpl extends ServiceImpl<OrderInfoMapper,
     }
 
     @Override
-    public List<InspectionInfo> inspectionList(String status) {
+    public IPage<InspectionInfo> inspectionList(Page<InspectionInfo> page, String status) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        return baseMapper.inspectionList(status,user.getId());
+        return baseMapper.inspectionList(page,status,user.getId());
     }
 
     @Override
@@ -249,8 +251,8 @@ public class AppInspectionOrderServiceImpl extends ServiceImpl<OrderInfoMapper,
     }
 
     @Override
-    public List<InspectionInfo> governmentInspectionList(String carNum, String status, String partnerId) {
+    public IPage<InspectionInfo> governmentInspectionList(Page<InspectionInfo> page,String carNum, String status, String partnerId) {
-        return baseMapper.governmentInspectionList(carNum,status,partnerId);
+        return baseMapper.governmentInspectionList(page,carNum,status,partnerId);
     }
 
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java

@@ -119,11 +119,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
     private RoleService roleService;
 
     @Override
-    public List<PartnerListVo> partnerList(PartnerListQuery partnerListQuery) {
+    public IPage<PartnerListVo> partnerList(Page<PartnerListVo> page, PartnerListQuery partnerListQuery) {
         if (null!=partnerListQuery.getDistance()){
             partnerListQuery.setDistance(partnerListQuery.getDistance()*1000);
         }
-        List<PartnerListVo> partnerListVos = baseMapper.partnerList(partnerListQuery);
+        IPage<PartnerListVo> partnerListVos = baseMapper.partnerList(page,partnerListQuery);
         return partnerListVos;
     }
 
@@ -234,10 +234,6 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
     @Override
     public StatisticsInfo statisticsInfo(Long partnerId) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        ShopMallPartners partners = baseMapper.selectById(partnerId);
-        if (!partners.getUserId().equals(user.getId())){
-            return null;
-        }
         StatisticsInfo statisticsInfo2 = baseMapper.orderNum(partnerId, DateUtil.format(new Date(),"yyyy-MM-dd"));
         //合规且合格双燃料
         Integer i = baseMapper.srlNum(partnerId, DateUtil.format(new Date(), "yyyy-MM-dd"));
@@ -702,8 +698,8 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
     }
 
     @Override
-    public List<GoodsVo> goodsList(Long partnerId, String isListing, String goodsTitle) {
+    public IPage<GoodsVo> goodsList(Page<GoodsVo> page,Long partnerId, String isListing, String goodsTitle) {
-       return baseMapper.manageGoodsList(partnerId,isListing,goodsTitle);
+       return baseMapper.manageGoodsList(page,partnerId,isListing,goodsTitle);
     }
 
     @Override
@@ -874,7 +870,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
     }
 
     @Override
-    public List<PartnerBalanceDetail> accountDetail(Long partnerId, Integer pageNum, Integer pageSize) {
+    public IPage<PartnerBalanceDetail> accountDetail(Page<PartnerBalanceDetail> page,Long partnerId, Integer pageNum, Integer pageSize) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         ShopMallPartners partnersTmp = baseMapper.selectById(partnerId);
         if (!partnersTmp.getUserId().equals(user.getId())){
@@ -883,15 +879,15 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
         LambdaQueryWrapper<PartnerBalance> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(PartnerBalance::getPartnerId,partnerId);
         PartnerBalance one = partnerBalanceService.getOne(queryWrapper);
-        PageHelper.startPage(pageNum, pageSize);
+
         LambdaQueryWrapper<PartnerBalanceDetail> queryWrapper1 =new LambdaQueryWrapper<>();
         queryWrapper1.eq(PartnerBalanceDetail::getPartnerBalanceId,one.getId()).orderByDesc(PartnerBalanceDetail::getChangeTime);
-        return  detailService.list(queryWrapper1);
+        return  detailService.page(page,queryWrapper1);
     }
 
     @Override
-    public List<OrderAppDetail> orderList(Long partnerId,String phoneNum, String title) {
+    public IPage<OrderAppDetail> orderList(Page<OrderAppDetail> page,Long partnerId,String phoneNum, String title) {
-        return baseMapper.orderList(partnerId,phoneNum,title);
+        return baseMapper.orderList(page,partnerId,phoneNum,title);
     }
 
     @Override
@@ -1247,9 +1243,9 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
     }
 
     @Override
-    public List<OrderInfo> validationList(Long partnerId,String searchValue) {
+    public IPage<OrderInfo> validationList(Page<OrderInfo> page, Long partnerId,String searchValue) {
 
-        return baseMapper.validationList(partnerId,searchValue);
+        return baseMapper.validationList(page,partnerId,searchValue);
     }
 
     @Override
@@ -1285,12 +1281,12 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
     }
 
     @Override
-    public List<ShopCouponTemplate> listCoupon(Long partnerId, String searchValue) {
+    public IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> page,Long partnerId, String searchValue) {
         LambdaQueryWrapper<ShopCouponTemplate> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(ShopCouponTemplate::getPartnerId,partnerId).eq(ShopCouponTemplate::getBindMoudle,"检测项目现金券")
                 .eq(StringUtils.isNotEmpty(searchValue),ShopCouponTemplate::getTitle,searchValue).orderByDesc(TenantBaseDO::getCreateTime);
 
-        return templateService.listCoupon(partnerId,searchValue);
+        return templateService.listCoupon(page,partnerId,searchValue);
     }
 
     @Override
@@ -1330,8 +1326,8 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
     }
 
     @Override
-    public List<InspectionPickCar> getPickCarListOfWorker(Long workerId, String phoneNum) {
+    public IPage<InspectionPickCar> getPickCarListOfWorker(Page<InspectionPickCar> page,Long workerId, String phoneNum) {
-        return  baseMapper.getPickCarListOfWorker(workerId,phoneNum);
+        return  baseMapper.getPickCarListOfWorker(page,workerId,phoneNum);
     }
 
     @Override

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppUserOwnServiceImpl.java

@@ -18,6 +18,8 @@ import cn.iocoder.yudao.util.StringUtils;
 import cn.iocoder.yudao.module.inspection.service.AppUserOwnService;
 import cn.iocoder.yudao.module.shop.entity.ShopUserCar;
 import cn.iocoder.yudao.module.shop.service.IShopUserCarService;
+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.stereotype.Service;
 import java.time.Instant;
@@ -89,11 +91,15 @@ public class AppUserOwnServiceImpl implements AppUserOwnService {
     }
 
     @Override
-    public List<AdminUserDO> getDbList(String searchValue) {
+    public List<AdminUserDO> getDbList(Page<AdminUserDO> page, String searchValue) {
         String roleCode = "jcdb";
         return userService.getUsersByRoleRescue(roleCode,searchValue,null);
     }
-
+    @Override
+    public IPage<AdminUserDO> getDbListTow(Page<AdminUserDO> page, String searchValue) {
+        String roleCode = "jcdb";
+        return userService.getUsersByRoleRescueTow(page,roleCode,searchValue,null);
+    }
     @Override
     public List<ShopUserCar> getAppUserCar() {
         //当前登录用户

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/DelInspectionInfoServiceImpl.java

@@ -5,6 +5,8 @@ import cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo;
 import cn.iocoder.yudao.module.inspection.mapper.DelInspectionInfoMapper;
 import cn.iocoder.yudao.module.inspection.service.IDelInspectionInfoService;
 import cn.iocoder.yudao.util.DateUtils;
+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.stereotype.Service;
 
@@ -40,9 +42,9 @@ public class DelInspectionInfoServiceImpl implements IDelInspectionInfoService
      * @return 【请填写功能名称】
      */
     @Override
-    public List<DelInspectionInfo> selectDelInspectionInfoList(DelInspectionInfo delInspectionInfo)
+    public IPage<DelInspectionInfo> selectDelInspectionInfoList(Page<DelInspectionInfo> page, DelInspectionInfo delInspectionInfo)
     {
-        return delInspectionInfoMapper.selectDelInspectionInfoList(delInspectionInfo);
+        return delInspectionInfoMapper.selectDelInspectionInfoList(page,delInspectionInfo);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java

@@ -72,9 +72,9 @@ public class InspectionAppointmentServiceImpl extends ServiceImpl<InspectionAppo
      * @return 【请填写功能名称】
      */
     @Override
-    public List<InspectionAppointment> selectInspectionAppointmentList(InspectionAppointment inspectionAppointment)
+    public IPage<InspectionAppointment> selectInspectionAppointmentList(Page<InspectionAppointment> page, InspectionAppointment inspectionAppointment)
     {
-        return baseMapper.selectInspectionAppointmentList(inspectionAppointment);
+        return baseMapper.selectInspectionAppointmentList(page,inspectionAppointment);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionCategoryTemplateServiceImpl.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
 import org.springframework.stereotype.Service;
@@ -38,9 +40,9 @@ public class InspectionCategoryTemplateServiceImpl extends ServiceImpl<Inspectio
      * @return 分类模版
      */
     @Override
-    public List<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(InspectionCategoryTemplate inspectionCategoryTemplate)
+    public IPage<InspectionCategoryTemplate> selectInspectionCategoryTemplateList(Page<InspectionCategoryTemplate> page, InspectionCategoryTemplate inspectionCategoryTemplate)
     {
-        return baseMapper.selectInspectionCategoryTemplateList(inspectionCategoryTemplate);
+        return baseMapper.selectInspectionCategoryTemplateList(page,inspectionCategoryTemplate);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java

@@ -1,22 +1,21 @@
 package cn.iocoder.yudao.module.inspection.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
+import cn.iocoder.yudao.module.inspection.entity.WarnMessage;
+import cn.iocoder.yudao.module.inspection.mapper.InspectionFileMapper;
+import cn.iocoder.yudao.module.inspection.service.IInspectionFileService;
+import cn.iocoder.yudao.module.inspection.service.IWarnMessageService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.iocoder.yudao.util.DateUtils;
-import cn.iocoder.yudao.module.inspection.entity.WarnMessage;
-import cn.iocoder.yudao.module.inspection.service.IWarnMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.iocoder.yudao.module.inspection.mapper.InspectionFileMapper;
+
-import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
+import java.util.Arrays;
-import cn.iocoder.yudao.module.inspection.service.IInspectionFileService;
+import java.util.List;
 
 /**
  * inspectionFileService业务层处理
@@ -42,17 +41,6 @@ public class InspectionFileServiceImpl extends ServiceImpl<InspectionFileMapper,
         return baseMapper.selectInspectionFileById(id);
     }
 
-    /**
-     * 查询inspectionFile列表
-     *
-     * @param inspectionFile inspectionFile
-     * @return inspectionFile
-     */
-    @Override
-    public List<InspectionFile> selectInspectionFileList(InspectionFile inspectionFile)
-    {
-        return baseMapper.selectInspectionFileList(inspectionFile);
-    }
 
     /**
      * 新增inspectionFile

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java

@@ -88,9 +88,9 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
      * @return 【请填写功能名称】
      */
     @Override
-    public List<InspectionInfo> selectInspectionInfoList(InspectionInfo inspectionInfo)
+    public IPage<InspectionInfo> selectInspectionInfoList(Page<InspectionInfo> page, InspectionInfo inspectionInfo)
     {
-        return baseMapper.selectInspectionInfoList(inspectionInfo);
+        return baseMapper.selectInspectionInfoList(page,inspectionInfo);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsAssociationServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
 import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation;
@@ -41,9 +43,9 @@ public class InspectionNewsAssociationServiceImpl extends ServiceImpl<Inspection
      * @return 【请填写功能名称】
      */
     @Override
-    public List<InspectionNewsAssociation> selectInspectionNewsAssociationList(InspectionNewsAssociation inspectionNewsAssociation)
+    public IPage<InspectionNewsAssociation> selectInspectionNewsAssociationList(Page<InspectionNewsAssociation> page, InspectionNewsAssociation inspectionNewsAssociation)
     {
-        return baseMapper.selectInspectionNewsAssociationList(inspectionNewsAssociation);
+        return baseMapper.selectInspectionNewsAssociationList(page,inspectionNewsAssociation);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsCommentServiceImpl.java

@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.inspection.service.impl;
 import java.util.List;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
 
@@ -43,9 +45,9 @@ public class InspectionNewsCommentServiceImpl extends ServiceImpl<InspectionNews
      * @return 【请填写功能名称】
      */
     @Override
-    public List<InspectionNewsComment> selectInspectionNewsCommentList(InspectionNewsComment inspectionNewsComment)
+    public IPage<InspectionNewsComment> selectInspectionNewsCommentList(Page<InspectionNewsComment> page, InspectionNewsComment inspectionNewsComment)
     {
-        return baseMapper.selectInspectionNewsCommentList(inspectionNewsComment);
+        return baseMapper.selectInspectionNewsCommentList(page,inspectionNewsComment);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java

@@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
@@ -23,6 +24,7 @@ import cn.iocoder.yudao.module.inspection.service.IInspectionNewsAssociationServ
 import cn.iocoder.yudao.module.inspection.service.IInspectionNewsCommentService;
 import cn.iocoder.yudao.module.inspection.service.IInspectionNewsService;
 import cn.iocoder.yudao.module.inspection.utils.HtmlFilter;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -62,14 +64,14 @@ public class InspectionNewsServiceImpl extends ServiceImpl<InspectionNewsMapper,
      * @return 【请填写功能名称】
      */
     @Override
-    public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, InspectionNews inspectionNews)
+    public IPage<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, InspectionNews inspectionNews)
     {
         if (null!=inspectionNews.getPublishUnit() && inspectionNews.getPublishUnit().equals("检测站公告")){
             inspectionNews.setCategory("jczgg");
             inspectionNews.setPublishUnit(null);
         }
-        List<InspectionNews> list = baseMapper.selectInspectionNewsList(page,inspectionNews);
+        IPage<InspectionNews> list = baseMapper.selectInspectionNewsList(page,inspectionNews);
-        list.forEach(it->{
+        list.getRecords().forEach(it->{
             it.setNewsContent(HtmlFilter.dealFunction(it.getNewsContent()));
         });
         return list;
@@ -252,10 +254,10 @@ public class InspectionNewsServiceImpl extends ServiceImpl<InspectionNewsMapper,
     }
 
     @Override
-    public List<InspectionNews> collectionNews(String newsName) {
+    public IPage<InspectionNews> collectionNews(Page<InspectionNews> page,String newsName) {
         //获取用户名称
         Long  userId = SecurityFrameworkUtils.getLoginUserId();
-        return baseMapper.collectionNews(userId,newsName);
+        return baseMapper.collectionNews(page,userId,newsName);
     }
 
     @Override
@@ -265,9 +267,9 @@ public class InspectionNewsServiceImpl extends ServiceImpl<InspectionNewsMapper,
 
     @Override
     @TenantIgnore
-    public  List<InspectionNews> msgList(Long partnerId) {
+    public  IPage<InspectionNews> msgList(Page<InspectionNews> page, Long partnerId) {
-        List<InspectionNews> news = baseMapper.msgList(partnerId);
+        IPage<InspectionNews> news = baseMapper.msgList(page, partnerId);
-        news.forEach(it->{
+        news.getRecords().forEach(it->{
             it.setNewsContent(HtmlFilter.dealFunction(it.getNewsContent()));
         });
         return news;

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionPickCarServiceImpl.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
 import org.springframework.stereotype.Service;
@@ -38,9 +40,9 @@ public class InspectionPickCarServiceImpl extends ServiceImpl<InspectionPickCarM
      * @return 上门取车服务
      */
     @Override
-    public List<InspectionPickCar> selectInspectionPickCarList(InspectionPickCar inspectionPickCar)
+    public IPage<InspectionPickCar> selectInspectionPickCarList(Page<InspectionPickCar> page, InspectionPickCar inspectionPickCar)
     {
-        return baseMapper.selectInspectionPickCarList(inspectionPickCar);
+        return baseMapper.selectInspectionPickCarList(page,inspectionPickCar);
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionCategoryServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.util.StringUtils;
 import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate;
 import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods;

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionGoodsServiceImpl.java

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.StringUtils;
@@ -128,15 +129,15 @@ public class ShopInspectionGoodsServiceImpl extends ServiceImpl<ShopInspectionGo
      * @return 检测商品
      */
     @Override
-    public List<ShopInspectionGoods> selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods)
+    public IPage<ShopInspectionGoods> selectShopInspectionGoodsListWx(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods)
     {
         //默认蓝安的id为888
         ShopConfig shopConfig = configService.selectShopConfigById(1L);
         //获取最高会员的优惠折扣
         BigDecimal inspectionPlatinum = shopConfig.getInspectionPlatinum();
         Double ratio = inspectionPlatinum.divide(BigDecimal.valueOf(10)).doubleValue();
-        List<ShopInspectionGoods> shopInspectionRes = baseMapper.selectShopInspectionGoodsListWx(shopInspectionGoods);
+        IPage<ShopInspectionGoods> shopInspectionRes = baseMapper.selectShopInspectionGoodsListWx(page,shopInspectionGoods);
-        for (ShopInspectionGoods good : shopInspectionRes) {
+        for (ShopInspectionGoods good : shopInspectionRes.getRecords()) {
             if (good.getIsSpecial().equals(0)){
                 //原价单位分
                 Long priceFen = good.getPrice();
@@ -230,15 +231,15 @@ public class ShopInspectionGoodsServiceImpl extends ServiceImpl<ShopInspectionGo
     }
     //后台管理的列表查询部分
     @Override
-    public List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) {
+    public IPage<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) {
         return baseMapper.listSystem(page,shopInspectionGoods);
 
     }
 
     @Override
-    public List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception {
+    public IPage<ShopInspectionGoods> listPartnerGoods(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) throws Exception {
 
-        return baseMapper.listPartnerGoods(shopInspectionGoods);
+        return baseMapper.listPartnerGoods(page,shopInspectionGoods);
     }
 
     @Override

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/SiteInfoServiceImpl.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.inspection.entity.NweUsers;
 import cn.iocoder.yudao.util.DateUtils;
 import com.alibaba.fastjson.JSONObject;
+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.stereotype.Service;
@@ -44,10 +45,10 @@ public class SiteInfoServiceImpl implements ISiteInfoService
      * @return inspection
      */
     @Override
-    public List<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,SiteInfo siteInfo)
+    public IPage<SiteInfo> selectSiteInfoList(Page<SiteInfo> page, SiteInfo siteInfo)
     {
-        List<SiteInfo> siteInfos = siteInfoMapper.selectSiteInfoList(page,siteInfo);
+        IPage<SiteInfo> siteInfos = siteInfoMapper.selectSiteInfoList(page,siteInfo);
-        for (SiteInfo info : siteInfos) {
+        for (SiteInfo info : siteInfos.getRecords()) {
             if (null!=info.getSiteLongitude()&&null!=info.getSiteLatitude()){
                 info.setLongitude(info.getSiteLongitude().toString());
                 info.setLatitude(info.getSiteLatitude().toString());

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.partner.controller;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
+import cn.iocoder.yudao.module.core.text.Convert;
+import cn.iocoder.yudao.module.core.text.ServletUtils;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
 import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
 import cn.iocoder.yudao.module.partner.service.IPartnerCustomerInfoService;

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/FzRecordController.java

@@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.payment.controller;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.payment.entity.FzRecord;
 import cn.iocoder.yudao.module.payment.service.IFzRecordService;
 import cn.iocoder.yudao.util.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;
@@ -31,11 +31,13 @@ public class FzRecordController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FzRecord fzRecord,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(FzRecord fzRecord,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<FzRecord> page = new Page<>(pageNum, pageSize);
-        List<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
+        IPage<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -43,12 +45,14 @@ public class FzRecordController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, FzRecord fzRecord)
+    public void export(HttpServletResponse response, FzRecord fzRecord,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        Page<FzRecord> page = new Page<>();
+        Page<FzRecord> page = new Page<>(pageNum,pageSize);
-        List<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
+        IPage<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
         ExcelUtil<FzRecord> util = new ExcelUtil<FzRecord>(FzRecord.class);
-        util.exportExcel(response, list, "分账记录数据");
+        util.exportExcel(response, list.getRecords(), "分账记录数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java

@@ -4,7 +4,6 @@ package cn.iocoder.yudao.module.payment.controller;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.core.page.PageDomain;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.core.page.TableSupport;
 import cn.iocoder.yudao.module.core.text.Convert;
 import cn.iocoder.yudao.module.core.text.ServletUtils;
@@ -15,6 +14,7 @@ import cn.iocoder.yudao.module.payment.service.OrderInfoService;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
 import cn.iocoder.yudao.module.shop.service.IShopMallPartnersService;
 import cn.iocoder.yudao.util.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,10 +61,12 @@ public class OrderController extends BaseController {
     }
 
     @GetMapping("/orderList")
-    public TableDataInfo orderList(String status, String title) {
+    public CommonResult orderList(String status, String title,
-        startPage();
+                                  @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
-        List<OrderInfo> orderInfos = orderInfoService.orderList(status, title);
+                                  @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
-        return getDataTable(orderInfos);
+        Page<OrderInfo> page = new Page<>(pageNum, pageSize);
+        IPage<OrderInfo> orderInfos = orderInfoService.orderList(page,status, title);
+        return success(orderInfos);
 
     }
 
@@ -94,18 +96,20 @@ public class OrderController extends BaseController {
 
     // 核销记录By核销人Id 微信端
     @GetMapping("/validationListWx")
-    public TableDataInfo validationListWx(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) {
+    public CommonResult validationListWx(@RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
         Page<OrderInfo> page = new Page<>(pageNum, pageSize);
-        List<OrderInfo> list = orderInfoService.validationListWx(page);
+        IPage<OrderInfo> list = orderInfoService.validationListWx(page);
-        return getDataTable(list);
+        return success(list);
     }
 
     // 商城核销记录By核销人Id PC
     @GetMapping("/validationListPc")
-    public TableDataInfo validationListPc(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) {
+    public CommonResult validationListPc(@RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
         Page<OrderInfo> page = new Page<>(pageNum, pageSize);
-        List<OrderInfo> list = orderInfoService.validationListPc(page);
+        IPage<OrderInfo> list = orderInfoService.validationListPc(page);
-        return getDataTable(list);
+        return success(list);
     }
 
 
@@ -120,12 +124,12 @@ public class OrderController extends BaseController {
      * 查询检测订单列表
      */
     @GetMapping("/orderListSystem")
-    public TableDataInfo orderListSystem(OrderInfo shopInspectionOrder) {
+    public CommonResult orderListSystem(OrderInfo shopInspectionOrder,
-        int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+                                        @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
-        int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
+                                        @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
-        startPage();
+        Page<OrderInfo> page = new Page<>(pageNum, pageSize);
-        List<OrderInfo> list = orderInfoService.orderListSystem(shopInspectionOrder);
+        IPage<OrderInfo> list = orderInfoService.orderListSystem(page,shopInspectionOrder);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -155,27 +159,31 @@ public class OrderController extends BaseController {
      */
 
     @GetMapping("/getCommentOrderList")
-    public TableDataInfo getCommentOrderList(Long partnerId,Integer pageNum,Integer pageSize) {
+    public CommonResult getCommentOrderList(Long partnerId,
+                                            @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
         //判断商家是否开启评论区
         ShopMallPartners partners = partnerService.getById(partnerId);
         if (StringUtils.isEmpty(partners.getOpenComment())||partners.getOpenComment().equals("0")){
-            return getDataTable(new ArrayList<>());
+            return success(new ArrayList<>());
         }
-        PageHelper.startPage(pageNum,pageSize);
+        Page<commentVo> page = new Page<>(pageNum, pageSize);
-        List<commentVo> commentOrderList = orderInfoService.getCommentOrderList(partnerId);
+        IPage<commentVo> commentOrderList = orderInfoService.getCommentOrderList(page,partnerId);
-        return getDataTable(commentOrderList);
+        return success(commentOrderList);
     }
 
     // pc端合作商订单列表
     @GetMapping("/listPc")
-    public TableDataInfo listPc(OrderInfo orderInfo) {
+    public CommonResult listPc(OrderInfo orderInfo,
+                               @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                               @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) {
         // 当前合作商的商品
         ShopMallPartners shopMallPartners = shopMallPartnersService.selectShopMallPartnersByUserId(getUserId(),"sc");
         orderInfo.setPartnerId(shopMallPartners.getPartnerId());
         PageDomain pageDomain = TableSupport.getPageDomain();
-        PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy());
+        Page<OrderInfo> page = new Page<>(pageNum, pageSize);
-        List<OrderInfo> list = orderInfoService.orderListPc(orderInfo);
+        IPage<OrderInfo> list = orderInfoService.orderListPc(page,orderInfo);
-        return getDataTable(list);
+        return success(list);
     }
 
     @GetMapping("/getOrderInfo/{id}")

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/FzRecordMapper.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.payment.mapper;
 
 import cn.iocoder.yudao.module.payment.entity.FzRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
@@ -31,6 +32,6 @@ public interface FzRecordMapper extends BaseMapper<FzRecord>
      * @param fzRecord 分账记录
      * @return 分账记录集合
      */
-    public List<FzRecord> selectFzRecordList(Page<FzRecord> page,@Param("vo") FzRecord fzRecord);
+    public IPage<FzRecord> selectFzRecordList(Page<FzRecord> page, @Param("vo") FzRecord fzRecord);
 
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 @Mapper
 public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
-    List<OrderInfo> orderListApp(@Param("userId") Long userId, @Param("status") String status, @Param("title") String title, @Param("type") String type);
+    IPage<OrderInfo> orderListApp(Page<OrderInfo> page, @Param("userId") Long userId, @Param("status") String status, @Param("title") String title, @Param("type") String type);
 
     Double avgPartnerScore(@Param("partnerId") Long partnerId);
 
@@ -30,9 +30,9 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
 
     List<JSONObject> statisticsMid();
 
-    List<InspectionInfo> inspectionList(@Param("status") String status, @Param("userId") Long userId);
+    IPage<InspectionInfo> inspectionList(Page<InspectionInfo> page, @Param("status") String status, @Param("userId") Long userId);
 
-    List<OrderInfo> orderListSystem(OrderInfo orderInfo);
+    IPage<OrderInfo> orderListSystem(Page<OrderInfo> page,@Param("vo") OrderInfo orderInfo);
 
     /**
      * 分页查询订单
@@ -51,18 +51,18 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
 
     List<JSONObject> getPartnerList(@Param("partnerName") String partnerName);
 
-    List<InspectionInfo> governmentInspectionList(@Param("carNum") String carNum, @Param("status") String status, @Param("partnerId") String partnerId);
+    IPage<InspectionInfo> governmentInspectionList(Page<InspectionInfo> page, @Param("carNum") String carNum, @Param("status") String status, @Param("partnerId") String partnerId);
 
-    List<OrderInfo> orderList(@Param("userId") Long userId, @Param("status") String status, @Param("title") String title);
+    IPage<OrderInfo> orderList(Page<OrderInfo> page,@Param("userId") Long userId, @Param("status") String status, @Param("title") String title);
 
-    List<OrderInfo> validationListWx(Page<OrderInfo> page, @Param("validationUserId") Long validationUserId);
+    IPage<OrderInfo> validationListWx(Page<OrderInfo> page, @Param("validationUserId") Long validationUserId);
 
-    List<OrderInfo> validationListPc(Page<OrderInfo> page, Long partnerId);
+    IPage<OrderInfo> validationListPc(Page<OrderInfo> page, Long partnerId);
 
     Integer getNoCommentOrder(@Param("userId") Long userId);
 
-    List<commentVo> getCommentOrderList(@Param("partnerId") Long partnerId);
+    IPage<commentVo> getCommentOrderList(Page<commentVo> page, @Param("partnerId") Long partnerId);
 
-    List<OrderInfo> orderListPc(OrderInfo orderInfo);
+    IPage<OrderInfo> orderListPc(Page<OrderInfo> page,@Param("vo") OrderInfo orderInfo);
 }
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/IFzRecordService.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.payment.service;
 
 import cn.iocoder.yudao.module.payment.entity.FzRecord;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
@@ -27,7 +28,7 @@ public interface IFzRecordService extends IService<FzRecord>
      * @param fzRecord 分账记录
      * @return 分账记录集合
      */
-    public List<FzRecord> selectFzRecordList(Page<FzRecord> page,FzRecord fzRecord);
+    public IPage<FzRecord> selectFzRecordList(Page<FzRecord> page, FzRecord fzRecord);
 
     /**
      * 新增分账记录

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java

@@ -24,7 +24,7 @@ import java.util.Map;
 public interface OrderInfoService extends IService<OrderInfo> {
     void reviewOrder(String orderId, Integer starLevel, String reviewStr) throws Exception;
 
-    List<OrderInfo> orderListApp(String status, String title, String type);
+    IPage<OrderInfo> orderListApp(Page<OrderInfo> page, String status, String title, String type);
 
     List<InspectionInfo> workOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime);
 
@@ -36,7 +36,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     IPage<InspectionInfo> pageDelworkOrder(Long partnerId, String carNum, String goodsTitle, String customerSource, String payType, String startTime, Long roleId, String endTime,Page<InspectionInfo> page);
 
-    List<OrderInfo> orderListSystem(OrderInfo orderInfo);
+    IPage<OrderInfo> orderListSystem(Page<OrderInfo> page,OrderInfo orderInfo);
 
     /**
      * 分页查询订单
@@ -60,7 +60,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     void cancelPay(Long orderId);
 
-    List<OrderInfo> orderList(String status, String title);
+    IPage<OrderInfo> orderList(Page<OrderInfo> page,String status, String title);
 
     String validation(String accessCode);
 
@@ -68,17 +68,17 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     String validationMall(String accessCode);
 
-    List<OrderInfo> validationListWx(Page<OrderInfo> page);
+    IPage<OrderInfo> validationListWx(Page<OrderInfo> page);
 
-    List<OrderInfo> validationListPc(Page<OrderInfo> page);
+    IPage<OrderInfo> validationListPc(Page<OrderInfo> page);
 
     Integer commentOrder(OrderInfo orderInfo);
 
     Integer getNoCommentOrder();
 
-    List<commentVo> getCommentOrderList(Long partnerId);
+    IPage<commentVo> getCommentOrderList(Page<commentVo> page,Long partnerId);
 
-    List<OrderInfo> orderListPc(OrderInfo orderInfo);
+    IPage<OrderInfo> orderListPc(Page<OrderInfo> page,OrderInfo orderInfo);
 
     OrderInfo getOrderByOrderNo(String orderNo);
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/FzRecordServiceImpl.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.payment.entity.FzRecord;
 import cn.iocoder.yudao.module.payment.mapper.FzRecordMapper;
 import cn.iocoder.yudao.module.payment.service.IFzRecordService;
 import cn.iocoder.yudao.util.DateUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -40,7 +41,7 @@ public class FzRecordServiceImpl extends ServiceImpl<FzRecordMapper, FzRecord> i
      * @return 分账记录
      */
     @Override
-    public List<FzRecord> selectFzRecordList(Page<FzRecord> page,FzRecord fzRecord)
+    public IPage<FzRecord> selectFzRecordList(Page<FzRecord> page, FzRecord fzRecord)
     {
         return baseMapper.selectFzRecordList(page,fzRecord);
     }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java

@@ -101,9 +101,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
     }
     @Override
-    public List<OrderInfo> orderListApp(String status, String title, String type) {
+    public IPage<OrderInfo> orderListApp(Page<OrderInfo> page,String status, String title, String type) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        return baseMapper.orderListApp(user.getId(), status, title, type);
+        return baseMapper.orderListApp(page,user.getId(), status, title, type);
     }
 
     @Override
@@ -163,8 +163,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
-    public List<OrderInfo> orderListSystem(OrderInfo orderInfo) {
+    public IPage<OrderInfo> orderListSystem(Page<OrderInfo> page,OrderInfo orderInfo) {
-        return baseMapper.orderListSystem(orderInfo);
+        return baseMapper.orderListSystem(page,orderInfo);
     }
 
     /**
@@ -712,10 +712,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
-    public List<OrderInfo> orderList(String status, String title) {
+    public IPage<OrderInfo> orderList(Page<OrderInfo> page,String status, String title) {
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
 
-        return baseMapper.orderList(user.getId(), status, title);
+        return baseMapper.orderList(page,user.getId(), status, title);
     }
 
     /**
@@ -802,13 +802,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
-    public List<OrderInfo> validationListWx(Page<OrderInfo> page) {
+    public IPage<OrderInfo> validationListWx(Page<OrderInfo> page) {
         return  baseMapper.validationListWx(page,SecurityFrameworkUtils.getLoginUserId());
     }
 
     // pc端核销记录 商城
     @Override
-    public List<OrderInfo> validationListPc(Page<OrderInfo> page) {
+    public IPage<OrderInfo> validationListPc(Page<OrderInfo> page) {
         ShopMallPartners shopMallPartners = shopMallPartnersService.selectShopMallPartnersByUserId(SecurityFrameworkUtils.getLoginUserId(),"sc");
         Long partnerId = shopMallPartners.getPartnerId();
         return baseMapper.validationListPc(page,partnerId);
@@ -829,13 +829,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
-    public List<commentVo>  getCommentOrderList(Long partnerId) {
+    public IPage<commentVo>  getCommentOrderList(Page<commentVo> page, Long partnerId) {
-        return baseMapper.getCommentOrderList(partnerId);
+        return baseMapper.getCommentOrderList(page,partnerId);
     }
 
     @Override
-    public List<OrderInfo> orderListPc(OrderInfo orderInfo) {
+    public IPage<OrderInfo> orderListPc(Page<OrderInfo> page, OrderInfo orderInfo) {
-        return baseMapper.orderListPc(orderInfo);
+        return baseMapper.orderListPc(page,orderInfo);
     }
 
     @Override

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/PartnerDetailController.java

@@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.shop.controller;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
 import cn.iocoder.yudao.module.shop.service.IPartnerDetailService;
 import cn.iocoder.yudao.util.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;
@@ -31,11 +31,13 @@ public class PartnerDetailController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:detail:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PartnerDetail partnerDetail,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(PartnerDetail partnerDetail,
+                              @RequestParam(value = "pageNum",required = false ,defaultValue = "1") Integer pageNum,
+                              @RequestParam(value = "pageSize",required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<PartnerDetail> page = new Page<>(pageNum, pageSize);
-        List<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
+        IPage<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -43,12 +45,15 @@ public class PartnerDetailController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:detail:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PartnerDetail partnerDetail)
+    public void export(HttpServletResponse response, PartnerDetail partnerDetail,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        Page<PartnerDetail> page = new Page<>();
+        Page<PartnerDetail> page = new Page<>(pageNum, pageSize);
-        List<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
+        IPage<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
         ExcelUtil<PartnerDetail> util = new ExcelUtil<PartnerDetail>(PartnerDetail.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+
+        util.exportExcel(response, list.getRecords(), "【请填写功能名称】数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponController.java

@@ -3,14 +3,16 @@ package cn.iocoder.yudao.module.shop.controller;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
 import cn.iocoder.yudao.module.core.page.PageDomain;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.core.page.TableSupport;
 import cn.iocoder.yudao.module.shop.entity.ShopCoupon;
 import cn.iocoder.yudao.module.shop.service.IShopCouponService;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.github.pagehelper.PageHelper;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -38,11 +40,13 @@ public class ShopCouponController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:ShopCoupon:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ShopCoupon shopCoupon,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize)
+    public CommonResult list(ShopCoupon shopCoupon,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
-        List<ShopCoupon> list = shopCouponService.selectShopCouponList(page,shopCoupon);
+        IPage<ShopCoupon> list = shopCouponService.selectShopCouponList(page,shopCoupon);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -50,12 +54,14 @@ public class ShopCouponController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:ShopCoupon:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ShopCoupon shopCoupon)
+    public void export(HttpServletResponse response, ShopCoupon shopCoupon,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        Page<ShopCoupon> page = new Page<>();
+        Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
-        List<ShopCoupon> list = shopCouponService.selectShopCouponList(page,shopCoupon);
+        IPage<ShopCoupon> list = shopCouponService.selectShopCouponList(page,shopCoupon);
         ExcelUtil<ShopCoupon> util = new ExcelUtil<ShopCoupon>(ShopCoupon.class);
-        util.exportExcel(response, list, "优惠券数据");
+        util.exportExcel(response, list.getRecords(), "优惠券数据");
     }
 
     /**
@@ -109,18 +115,24 @@ public class ShopCouponController extends BaseController
     }
     /* 我的优惠券 by userId */
     @GetMapping(value = "/listByUserId")
-    public TableDataInfo listByUserId(ShopCoupon shopCoupon)
+    public CommonResult listByUserId(ShopCoupon shopCoupon,
+                                     @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         shopCoupon.setUserId(getUserId());
         PageDomain pageDomain = TableSupport.getPageDomain();
-        PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy());
+        Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
-        List<ShopCoupon> list = shopCouponService.selectShopCouponByUserId(shopCoupon);
+        IPage<ShopCoupon> list = shopCouponService.selectShopCouponByUserId(page,shopCoupon);
-        return getDataTable(list);
+        return success(list);
     }
 
     /* 可用优惠券 by userId */
     @GetMapping(value = "/availableCouponsListByUserId")
-    public TableDataInfo availableCouponsListByUserId(ShopCoupon shopCoupon, @RequestParam("type") String type, @RequestParam(value = "goodId",required = false) Long goodId)
+    public CommonResult availableCouponsListByUserId(ShopCoupon shopCoupon,
+                                                     @RequestParam("type") String type,
+                                                     @RequestParam(value = "goodId",required = false) Long goodId,
+                                                     @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         shopCoupon.setUserId(getUserId());
         if ("jc".equals(type)){
@@ -132,19 +144,23 @@ public class ShopCouponController extends BaseController
                 shopCoupon.setBindMoudle("维修项目现金券");
             }else {
                 List<ShopCoupon>  list = shopCouponService.getQxCouponList(getUserId(),goodId);
-                return getDataTable(list);
+                return success(list);
             }
         }
         shopCoupon.setCouponStatus("0");
         PageDomain pageDomain = TableSupport.getPageDomain();
-        PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy());
+        Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
-        List<ShopCoupon>  list = shopCouponService.availableCouponsListByUserId(shopCoupon);
+        IPage<ShopCoupon>  list = shopCouponService.availableCouponsListByUserId(page,shopCoupon);
-        return getDataTable(list);
+        return success(list);
     }
 
     /* 可用优惠券 by userId */
     @GetMapping(value = "/unAvailableCouponsListByUserId")
-    public TableDataInfo unAvailableCouponsListByUserId(ShopCoupon shopCoupon, @RequestParam("type") String type, @RequestParam(value = "goodId",required = false) Long goodId)
+    public CommonResult unAvailableCouponsListByUserId(ShopCoupon shopCoupon,
+                                                       @RequestParam("type") String type,
+                                                       @RequestParam(value = "goodId",required = false) Long goodId,
+                                                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         shopCoupon.setUserId(getUserId());
         if ("jc".equals(type)){
@@ -156,16 +172,16 @@ public class ShopCouponController extends BaseController
                 shopCoupon.setBindMoudle("维修项目现金券");
             }else {
                 List<ShopCoupon>  list = shopCouponService.unGetQxCouponList(getUserId(),goodId);
-                return getDataTable(list);
+                return success(list);
             }
         }
         shopCoupon.setCouponStatus("0");
 
         PageDomain pageDomain = TableSupport.getPageDomain();
-        PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize(), pageDomain.getOrderBy());
+        Page<ShopCoupon> page = new Page<>(pageNum, pageSize);
 
-        List<ShopCoupon> list = shopCouponService.unAvailableCouponsListByUserId(shopCoupon);
+        IPage<ShopCoupon> list = shopCouponService.unAvailableCouponsListByUserId(page,shopCoupon);
-        return getDataTable(list);
+        return success(list);
     }
 
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponTemplateController.java

@@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.shop.controller;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
 import cn.iocoder.yudao.module.shop.service.IShopCouponTemplateService;
 import cn.iocoder.yudao.util.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;
@@ -31,11 +31,13 @@ public class ShopCouponTemplateController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('shop:couponTemplate:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ShopCouponTemplate shopCouponTemplate,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(ShopCouponTemplate shopCouponTemplate,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
-        List<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
+        IPage<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
@@ -43,12 +45,14 @@ public class ShopCouponTemplateController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('shop:couponTemplate:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ShopCouponTemplate shopCouponTemplate)
+    public void export(HttpServletResponse response, ShopCouponTemplate shopCouponTemplate,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        Page<ShopCouponTemplate> page = new Page<>();
+        Page<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
-        List<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
+        IPage<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
         ExcelUtil<ShopCouponTemplate> util = new ExcelUtil<ShopCouponTemplate>(ShopCouponTemplate.class);
-        util.exportExcel(response, list, "优惠券模板数据");
+        util.exportExcel(response, list.getRecords(), "优惠券模板数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java

@@ -3,11 +3,12 @@ package cn.iocoder.yudao.module.shop.controller;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
 import cn.iocoder.yudao.module.shop.entity.ShopUserCar;
 import cn.iocoder.yudao.module.shop.service.IShopUserCarService;
 import cn.iocoder.yudao.util.ExcelUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -34,30 +35,36 @@ public class ShopUserCarController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:userCar:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ShopUserCar shopUserCar,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult list(ShopUserCar shopUserCar,
+                             @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                             @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<ShopUserCar> page = new Page<>(pageNum, pageSize);
-        List<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
+        IPage<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
-        return getDataTable(list);
+        return success(list);
     }
     @GetMapping("/listOfPartner")
-    public TableDataInfo listOfPartner(ShopUserCar shopUserCar,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
+    public CommonResult listOfPartner(ShopUserCar shopUserCar,
+                                      @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
         Page<ShopUserCar> page = new Page<>(pageNum, pageSize);
-        List<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
+        IPage<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
-        return getDataTable(list);
+        return success(list);
     }
     /**
      * 导出用户车辆列表
      */
 //    @PreAuthorize("@ss.hasPermi('system:userCar:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ShopUserCar shopUserCar)
+    public void export(HttpServletResponse response, ShopUserCar shopUserCar,
+                       @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum,
+                       @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize)
     {
-        Page<ShopUserCar> page = new Page<>();
+        Page<ShopUserCar> page = new Page<>(pageNum,pageSize);
-        List<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
+        IPage<ShopUserCar> list = shopUserCarService.selectShopUserCarList(page,shopUserCar);
         ExcelUtil<ShopUserCar> util = new ExcelUtil<ShopUserCar>(ShopUserCar.class);
-        util.exportExcel(response, list, "用户车辆数据");
+        util.exportExcel(response, list.getRecords(), "用户车辆数据");
     }
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/PartnerDetailMapper.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.shop.mapper;
 
 import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
+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;
@@ -32,7 +33,7 @@ public interface PartnerDetailMapper
      * @param partnerDetail 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,@Param("vo") PartnerDetail partnerDetail);
+    public IPage<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page, @Param("vo") PartnerDetail partnerDetail);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.shop.entity.ShopCoupon;
 import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
+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;
@@ -33,7 +34,7 @@ public interface ShopCouponMapper extends BaseMapper<ShopCoupon>
      * @param shopCoupon 优惠券
      * @return 优惠券集合
      */
-    public List<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page,@Param("vo") ShopCoupon shopCoupon);
+    public IPage<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
 
     /**
      * 新增优惠券
@@ -68,11 +69,11 @@ public interface ShopCouponMapper extends BaseMapper<ShopCoupon>
      */
     public int deleteShopCouponByCouponIds(Long[] couponIds);
 
-    List<ShopCoupon> selectShopCouponByUserId(ShopCoupon shopCoupon);
+    IPage<ShopCoupon> selectShopCouponByUserId(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
 
-    List<ShopCoupon> availableCouponsListByUserId(ShopCoupon shopCoupon);
+    IPage<ShopCoupon> availableCouponsListByUserId(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
 
-    List<ShopCoupon> unAvailableCouponsListByUserId(ShopCoupon shopCoupon);
+    IPage<ShopCoupon> unAvailableCouponsListByUserId(Page<ShopCoupon> page, @Param("vo") ShopCoupon shopCoupon);
 
     List<ShopCoupon> canUseCoupon(@Param("userId") Long userId, @Param("partnerId")Integer partnerId,@Param("goodsIdStr") String goodsIdStr,@Param("bindMoudle") String bindMoudle);
     Integer canUseCouponCount(@Param("userId") Long userId, @Param("partnerId")Integer partnerId,@Param("goodsIdStr") String goodsIdStr,@Param("bindMoudle") String bindMoudle);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponTemplateMapper.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
+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;
@@ -31,7 +32,7 @@ public interface ShopCouponTemplateMapper extends BaseMapper<ShopCouponTemplate>
      * @param shopCouponTemplate 优惠券模板
      * @return 优惠券模板集合
      */
-    public List<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,@Param("vo") ShopCouponTemplate shopCouponTemplate);
+    public IPage<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,@Param("vo") ShopCouponTemplate shopCouponTemplate);
 
     /**
      * 新增优惠券模板
@@ -64,5 +65,5 @@ public interface ShopCouponTemplateMapper extends BaseMapper<ShopCouponTemplate>
      * @return 结果
      */
     public int deleteShopCouponTemplateByIds(Long[] ids);
-    List<ShopCouponTemplate>  listCoupon(@Param("partnerId") Long partnerId,@Param("searchValue") String searchValue);
+    IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> page, @Param("partnerId") Long partnerId, @Param("searchValue") String searchValue);
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopMallPartnersMapper.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
+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;
@@ -31,7 +32,7 @@ public interface ShopMallPartnersMapper extends BaseMapper<ShopMallPartners>
      * @param shopMallPartners 合作商管理
      * @return 合作商管理集合
      */
-    public List<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, @Param("shop") ShopMallPartners shopMallPartners);
+    public IPage<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, @Param("shop") ShopMallPartners shopMallPartners);
 
     /**
      * 新增合作商管理

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopUserCarMapper.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.shop.entity.ShopUserCar;
+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;
@@ -33,7 +34,7 @@ public interface ShopUserCarMapper extends BaseMapper<ShopUserCar>
      * @param shopUserCar 用户车辆
      * @return 用户车辆集合
      */
-    public List<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> page,@Param("vo") ShopUserCar shopUserCar);
+    public IPage<ShopUserCar> selectShopUserCarList(Page<ShopUserCar> page, @Param("vo") ShopUserCar shopUserCar);
 
     /**
      * 新增用户车辆

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IPartnerDetailService.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.shop.service;
 
 import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +31,7 @@ public interface IPartnerDetailService
      * @param partnerDetail 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,PartnerDetail partnerDetail);
+    public IPage<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page, PartnerDetail partnerDetail);
 
     /**
      * 新增【请填写功能名称】

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponService.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.shop.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.iocoder.yudao.module.shop.entity.ShopCoupon;
 import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
 
+
 import java.util.List;
 
 /**
@@ -29,7 +31,7 @@ public interface IShopCouponService extends IService<ShopCoupon>
      * @param shopCoupon 优惠券
      * @return 优惠券集合
      */
-    public List<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page,ShopCoupon shopCoupon);
+    public IPage<ShopCoupon> selectShopCouponList(Page<ShopCoupon> page, ShopCoupon shopCoupon);
 
     /**
      * 新增优惠券
@@ -65,11 +67,11 @@ public interface IShopCouponService extends IService<ShopCoupon>
      */
     public int deleteShopCouponByCouponId(Long couponId);
 
-    public List<ShopCoupon> selectShopCouponByUserId(ShopCoupon shopCoupon);
+    public IPage<ShopCoupon> selectShopCouponByUserId(Page<ShopCoupon> page, ShopCoupon shopCoupon);
 
-    public List<ShopCoupon> availableCouponsListByUserId(ShopCoupon shopCoupon);
+    public IPage<ShopCoupon> availableCouponsListByUserId(Page<ShopCoupon> page, ShopCoupon shopCoupon);
 
-    public List<ShopCoupon> unAvailableCouponsListByUserId(ShopCoupon shopCoupon);
+    public IPage<ShopCoupon> unAvailableCouponsListByUserId(Page<ShopCoupon> page,ShopCoupon shopCoupon);
 
     public int getOffsetCouponCount(Long userId, Long goodId);