From 921dc6d9b916f3a63a51f72ced693ffd9baf2f5e Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 31 Dec 2024 17:01:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComprehensiveController.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java index 7a589ab..5798476 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java @@ -1,5 +1,8 @@ package com.bonus.material.comprehensive.controller; +import cn.hutool.core.convert.Convert; +import com.bonus.common.biz.config.ListPagingUtil; +import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.comprehensive.entity.RentDetailDto; @@ -33,23 +36,26 @@ public class ComprehensiveController extends BaseController { @ApiOperation(value = "综合查询-装备信息") @GetMapping("/devList") public AjaxResult getDevList(DevInfoVo devInfo) { - startPage(); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); List list = devInfoService.getDevList(devInfo); - return AjaxResult.success(getDataTable(list)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } @ApiOperation(value = "综合查询-设备租赁明细") @GetMapping("/rentDetails") public AjaxResult getRentDetails(DevInfoVo devInfo) { - startPage(); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); List list = orderService.getRentDetails(devInfo); - return AjaxResult.success(getDataTable(list)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } @ApiOperation(value = "综合查询-订单信息查询") @GetMapping("/orderDetails") public AjaxResult getOrderDetails(OrderInfoDto orderInfoDto) { - startPage(); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); List list = orderService.getOrderInfos(orderInfoDto); - return AjaxResult.success(getDataTable(list)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } }