From e3e152b852291b9aa905195ed34d25a1d156bf19 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 24 Aug 2025 15:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/app/controller/BackReceiveController.java | 8 ++++---- .../main/resources/mapper/app/LeaseOutDetailsMapper.xml | 3 ++- .../material/controller/ScrapApplyDetailsController.java | 8 ++++---- .../com/bonus/sgzb/material/domain/BackApplyInfo.java | 8 ++++++++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index e256d9a4..86c4d0de 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -334,8 +334,8 @@ public class BackReceiveController extends BaseController { public AjaxResult backReceiveRecordWeb(@RequestBody BackApplyInfo record) { try { List list = backReceiveService.backReceiveRecordWeb(record); - Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); - Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + Integer pageIndex = Convert.toInt(record.getPageNum(), 1); + Integer pageSize = Convert.toInt(record.getPageSize(), 10); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } catch (Exception e) { throw new RuntimeException(e); @@ -347,8 +347,8 @@ public class BackReceiveController extends BaseController { public AjaxResult backReceiveRecordWebPt(@RequestBody BackApplyInfo record) { try { List list = backReceiveService.backReceiveRecordWebPt(record); - Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); - Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + Integer pageIndex = Convert.toInt(record.getPageNum(), 1); + Integer pageSize = Convert.toInt(record.getPageSize(), 10); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } catch (Exception e) { throw new RuntimeException(e); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index da5855bb..46a8679c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -462,7 +462,8 @@ su.nick_name leasePerson, su2.nick_name outPerson, mm.ma_code, - lod.car_code + lod.car_code, + mt.unit_name as unitName FROM lease_out_details lod LEFT JOIN lease_apply_details lad ON lod.parent_id = lad.parennt_id diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java index 2f3528f4..a891a84e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java @@ -196,8 +196,8 @@ public class ScrapApplyDetailsController extends BaseController { public AjaxResult scrapReceiveRecordWeb(@RequestBody BackApplyInfo record) { try { List list = scrapApplyDetailsService.scrapReceiveRecordWeb(record); - Integer pageIndex = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); - Integer pageSize = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10); + Integer pageIndex = Convert.toInt(record.getPageNum(), 1); + Integer pageSize = Convert.toInt(record.getPageSize(), 10); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } catch (Exception e) { throw new RuntimeException(e); @@ -209,8 +209,8 @@ public class ScrapApplyDetailsController extends BaseController { public AjaxResult scrapReceiveRecordWebPt(@RequestBody BackApplyInfo record) { try { List list = scrapApplyDetailsService.backReceiveRecordWebPt(record); - Integer pageIndex = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); - Integer pageSize = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10); + Integer pageIndex = Convert.toInt(record.getPageNum(), 1); + Integer pageSize = Convert.toInt(record.getPageSize(), 10); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } catch (Exception e) { throw new RuntimeException(e); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java index 517b42ee..4af11ac7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java @@ -290,4 +290,12 @@ public class BackApplyInfo extends BaseEntity { /** 预报废单号*/ private String forecastWasteCode; + + /**页数 */ + private Integer pageNum; + + /** 条数 *、 + * + */ + private Integer pageSize; }