From bf1db373051fc4f1aed6c543c50ca75f394a6367 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 17 Apr 2025 14:04:37 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/controller/BackRecordController.java | 13 +++++++++++-- .../material/controller/InputRecordController.java | 13 +++++++++++-- .../material/controller/LeaseRecordController.java | 14 ++++++++++++-- .../controller/ProjUsingRecordController.java | 13 +++++++++++-- .../controller/RepairRecordController.java | 13 +++++++++++-- .../material/controller/ScrapRecordController.java | 13 +++++++++++-- .../service/impl/StorageStatusServiceImpl.java | 3 ++- .../mapper/material/RepairAuditDetailsMapper.xml | 14 +++++++++----- 8 files changed, 78 insertions(+), 18 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java index 02721cb..deb0694 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.material.controller; +import com.bonus.sgzb.common.core.text.Convert; +import com.bonus.sgzb.common.core.utils.ListPagingUtil; +import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; + /** * @description 综合查询--退料记录查询 * @author hay @@ -41,9 +47,12 @@ public class BackRecordController extends BaseController { @GetMapping("/getBackRecordList") @RequiresPermissions("return:list:query") public AjaxResult getBackRecordList(BackRecord bean) { - startPage(); +// startPage(); List list = backRecordService.getBackRecordList(bean); - return AjaxResult.success(getDataTable(list)); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); +// return AjaxResult.success(getDataTable(list)); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java index 5deebe0..aee8d6f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.material.controller; +import com.bonus.sgzb.common.core.text.Convert; +import com.bonus.sgzb.common.core.utils.ListPagingUtil; +import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -22,6 +25,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; + /** * @author hay * @description 综合查询--机具入库查询 @@ -49,9 +55,12 @@ public class InputRecordController extends BaseController { @ApiOperation(value = "综合查询--机具出库查询列表") @GetMapping("/getOutputRecordList") public AjaxResult getOutputRecordList(OutRecord bean) { - startPage(); +// startPage(); List list = inputRecordService.getOutputRecordList(bean); - return AjaxResult.success(getDataTable(list)); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); +// return AjaxResult.success(getDataTable(list)); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java index 1320ced..d74930f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.material.controller; +import com.bonus.sgzb.common.core.text.Convert; +import com.bonus.sgzb.common.core.utils.ListPagingUtil; +import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -16,6 +19,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; + /** * @description 综合查询--领料记录查询 * @author hay @@ -35,9 +41,13 @@ public class LeaseRecordController extends BaseController { @GetMapping("/getLeaseRecordList") @RequiresPermissions("picking:list:query") public AjaxResult getLeaseRecordList(LeaseRecord bean) { - startPage(); +// startPage(); + List list = leaseRecordService.getLeaseRecordList(bean); - return AjaxResult.success(getDataTable(list)); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); +// return AjaxResult.success(getDataTable(list)); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java index 7985500..1a2ac28 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.material.controller; +import com.bonus.sgzb.common.core.text.Convert; +import com.bonus.sgzb.common.core.utils.ListPagingUtil; +import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; + /** * @description 综合查询--工程机具使用查询 * @author hay @@ -40,9 +46,12 @@ public class ProjUsingRecordController extends BaseController { @GetMapping("/getProjUsingRecordList") @RequiresPermissions("stquery:projUsingRecord:list") public AjaxResult getProjUsingRecordList(ProjUsingRecord bean) { - startPage(); +// startPage(); List list = projUsingRecordService.getProjUsingRecordList(bean); - return AjaxResult.success(getDataTable(list)); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); +// return AjaxResult.success(getDataTable(list)); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java index 6a6f70e..1162d39 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.material.controller; +import com.bonus.sgzb.common.core.text.Convert; +import com.bonus.sgzb.common.core.utils.ListPagingUtil; +import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; + /** * @description 综合查询--维修记录查询 * @author hay @@ -40,9 +46,12 @@ public class RepairRecordController extends BaseController { @GetMapping("/getRepairRecordList") @RequiresPermissions("tools:repair:list") public AjaxResult getRepairRecordList(RepairRecord bean) { - startPage(); +// startPage(); List list = repairRecordService.getRepairRecordList(bean); - return AjaxResult.success(getDataTable(list)); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); +// return AjaxResult.success(getDataTable(list)); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java index 7fcfcce..6ae67d2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.material.controller; +import com.bonus.sgzb.common.core.text.Convert; +import com.bonus.sgzb.common.core.utils.ListPagingUtil; +import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; + /** * @description 综合查询--机具报废查询 * @author hay @@ -40,9 +46,12 @@ public class ScrapRecordController extends BaseController { @GetMapping("/getScrapRecordList") @RequiresPermissions("stquery:deviceScrapQuery:list") public AjaxResult getBackRecordList(ScrapRecord bean) { - startPage(); +// startPage(); List list = scrapRecordService.getScrapRecordList(bean); - return AjaxResult.success(getDataTable(list)); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); +// return AjaxResult.success(getDataTable(list)); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/StorageStatusServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/StorageStatusServiceImpl.java index 5bcb95c..75f810d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/StorageStatusServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/StorageStatusServiceImpl.java @@ -24,6 +24,7 @@ public class StorageStatusServiceImpl implements StorageStatusService { @Override public List getStorageStatusList(StorageStatus bean) { - return storageStatusMapper.getStorageStatusList(bean); + List list = storageStatusMapper.getStorageStatusList(bean); + return list; } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml index c7fa70f..275fd3e 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml @@ -542,15 +542,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"