From 44a4c0d4a1e49ef9c8d3be970849a222a4a3d8ea Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 23 Jan 2025 09:50:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/ComplexQueryController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java index 4b72ff48..340c8cdf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java @@ -38,6 +38,10 @@ public class ComplexQueryController extends BaseController { @GetMapping("/getRetainedEquipmentList") public AjaxResult getRetainedEquipmentList(RetainedEquipmentInfo bean) { bean.setIsExport(1); + if (bean.getIsApp() != null && bean.getIsApp() == 1) { + List pageList = complexQueryService.getRetainedEquipmentList(bean); + return AjaxResult.success(pageList); + } startPage(); List pageList = complexQueryService.getRetainedEquipmentList(bean); return AjaxResult.success(getDataTable(pageList)); @@ -93,9 +97,10 @@ public class ComplexQueryController extends BaseController { @ApiOperation(value = "综合查询--查询在库机具设备详情") @GetMapping("/getStorageInfoList") public AjaxResult getStorageInfoList(StorageInfo bean) { - startPage(); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); List list = complexQueryService.getMaCodeList(bean); - return AjaxResult.success(getDataTable(list)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } /**