From 927d737f4bce7ad12d8f6aae60f83307fcadefbe Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 4 Mar 2025 17:17:47 +0800 Subject: [PATCH] =?UTF-8?q?service=20=E5=B1=82=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=EF=BC=88=E5=88=86=E9=A1=B5=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E4=BC=98=E5=8C=96=EF=BC=89=20(=E5=87=A0?= =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6=E4=BC=98=E5=8C=96)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/impl/AuthAdminServiceImpl.java | 2 -- .../auth/impl/AuthRoleServiceImpl.java | 2 -- .../auth/impl/InvSpaceServiceImpl.java | 5 ++-- .../auth/impl/SysDictTypeServiceImpl.java | 6 ---- .../impl/BasicBusTypeChangeServiceImpl.java | 5 ++-- .../impl/BasicBusTypePreServiceImpl.java | 10 +++---- .../impl/BasicBussinessTypeServiceImpl.java | 15 ++++------ .../api/service/inout/impl/IoCodeService.java | 10 +++---- .../service/inout/impl/IoCodeTempService.java | 5 ++-- .../impl/IoOrderDetailBizServiceImpl.java | 20 +++++-------- .../impl/IoOrderDetailCodeServiceImpl.java | 10 +++---- .../impl/IoOrderDetailResultServiceImpl.java | 10 +++---- .../inout/impl/IoOrderServiceImpl.java | 20 +++++-------- .../inout/impl/ReceiveDetailServiceImpl.java | 5 ++-- .../inout/impl/ReceiveServiceImpl.java | 5 ++-- .../service/inv/DeviceInspectTaskService.java | 5 ++-- .../service/inv/DeviceProjectSetService.java | 5 ++-- .../impl/DeviceMAOrderDetailServiceImpl.java | 5 ++-- .../inv/impl/DeviceMAOrderServiceImpl.java | 5 ++-- .../DeviceReceiveOrderDetailServiceImpl.java | 10 +++---- .../impl/DeviceReceiveOrderServiceImpl.java | 5 ++-- .../inv/impl/InvCountCodesServiceImpl.java | 5 ++-- .../impl/InvCountOrderDetailServiceImpl.java | 10 +++---- .../inv/impl/InvCountOrderServiceImpl.java | 5 ++-- .../inv/impl/InvMAOrderDetailServiceImpl.java | 5 ++-- .../inv/impl/InvMAOrderServiceImpl.java | 5 ++-- .../service/inv/impl/InvPlaceServiceImpl.java | 5 ++-- .../InvPreInProductDetailServiceImpl.java | 5 ++-- .../impl/InvPreProductDetailServiceImpl.java | 5 ++-- .../inv/impl/InvPreProductServiceImpl.java | 5 ++-- .../inv/impl/InvPreinDetailServiceImpl.java | 5 ++-- .../inv/impl/InvPreinOrderServiceImpl.java | 5 ++-- .../inv/impl/InvPreinProductServiceImpl.java | 5 ++-- .../inv/impl/InvProductServiceImpl.java | 30 ++++++++----------- .../inv/impl/InvProductServiceNew.java | 5 ++-- .../inv/impl/InvRemindMsgServiceImpl.java | 5 ++-- .../inv/impl/InvRemindSetServiceImpl.java | 5 ++-- .../purchase/impl/SupCertRemindMsgImpl.java | 5 ++-- .../purchase/impl/SupCompanyServiceImpl.java | 5 ++-- .../impl/ThrBusTypeOriginServiceImpl.java | 10 +++---- .../impl/ThrOrderUploadLogServiceImpl.java | 5 ++-- 41 files changed, 116 insertions(+), 184 deletions(-) diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index ec383dca..68e6b469 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -145,8 +145,6 @@ public class AuthAdminServiceImpl implements AuthAdminService { @Override public List selectNotSelectUser(FilterNoSelectUserRequest filterNoSelectUserRequest) { - - if (filterNoSelectUserRequest == null) { return Collections.emptyList(); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java index f02455de..6c62712f 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java @@ -21,8 +21,6 @@ public class AuthRoleServiceImpl implements AuthRoleService { @Resource private AuthRoleDao authRoleDao; - @Resource - private BasicBussinessTypeRoleDao basicBussinessTypeRoleDao; @Override public List listCustomerRoles(Integer page, Integer limit, Integer isCustomer) { diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index 6d6cd58c..7f97029a 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -39,9 +39,8 @@ public class InvSpaceServiceImpl implements InvSpaceService { if (null == filterInvSpaceRequest) { return Collections.emptyList(); } - if (null != filterInvSpaceRequest.getPage() && null != filterInvSpaceRequest.getLimit()) { - PageHelper.offsetPage((filterInvSpaceRequest.getPage() - 1) * filterInvSpaceRequest.getLimit(), filterInvSpaceRequest.getLimit()); - } + // 分页处理 + filterInvSpaceRequest.pageDispose(); return invSpaceDao.filterList(filterInvSpaceRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index b3fc33dc..cd90a0a8 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -81,7 +81,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { public void deleteDictTypeByIds(Long[] dictIds) { for (Long dictId : dictIds) { SysDictType dictType = selectDictTypeById(dictId); - SysDictDataRequest sysDictDataRequest = new SysDictDataRequest(); sysDictDataRequest.setDictType(dictType.getDictType()); SysDictData sysDictData = dictDataMapper.exists(sysDictDataRequest); @@ -118,10 +117,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Override @Transactional(rollbackFor = Exception.class) public List updateDictType(SysDictType dict) { - SysDictType oldDict = baseMapper.selectById(dict.getDictId()); -// dictDataMapper.updateByType(null, new LambdaUpdateWrapper() -// .set(SysDictData::getDictType, dict.getDictType()) -// .eq(SysDictData::getDictType, oldDict.getDictType())); int row = baseMapper.updateById(dict); if (row > 0) { SysDictDataRequest sysDictDataRequest = new SysDictDataRequest(); @@ -139,7 +134,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { */ @Override public String checkDictTypeUnique(SysDictType dict) { - SysDictTypeRequest sysDictTypeRequest = new SysDictTypeRequest(); sysDictTypeRequest.setDictType(dict.getDictType()); SysDictType exist = baseMapper.exists(sysDictTypeRequest); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index c1f46e0c..16ad39a6 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -41,9 +41,8 @@ public class BasicBusTypeChangeServiceImpl extends ServiceImpl filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest) { - if (null != busTypeChangeFilterRequest.getPage() && null != busTypeChangeFilterRequest.getLimit()) { - PageHelper.offsetPage((busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(), busTypeChangeFilterRequest.getLimit()); - } + // 分页处理 + busTypeChangeFilterRequest.pageDispose(); return basicBusTypePreDao.filterList(busTypeChangeFilterRequest); } @@ -70,9 +69,8 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl { if (null == filterCodeRequest) { return Collections.emptyList(); } - if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) { - PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit()); - } + // 分页处理 + filterCodeRequest.pageDispose(); return ioCodeDao.filterList(filterCodeRequest); } @@ -116,9 +115,8 @@ public class IoCodeService extends ServiceImpl { if (null == filterCodeRequest) { return Collections.emptyList(); } - if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) { - PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit()); - } + // 分页处理 + filterCodeRequest.pageDispose(); return ioCodeDao.filterDrugList(filterCodeRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java index c463f253..4c3ab219 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java @@ -131,9 +131,8 @@ public class IoCodeTempService { public List findCodeList(FilterCodeRequest filterCodeRequest) { - if (null != filterCodeRequest && null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) { - PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit()); - } + // 分页处理 + filterCodeRequest.pageDispose(); return ioCodeTempDao.selectCodeList(filterCodeRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 4ae24ec4..2855d45d 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -149,9 +149,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { if (null == orderDetailBizRequest) { return Collections.emptyList(); } - if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) { - PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit()); - } + // 分页处理 + orderDetailBizRequest.pageDispose(); return ioOrderDetailBizDao.filterList(orderDetailBizRequest); } @@ -161,9 +160,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { if (null == orderDetailBizRequest) { return Collections.emptyList(); } - if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) { - PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit()); - } + // 分页处理 + orderDetailBizRequest.pageDispose(); return ioOrderDetailBizDao.filterDrugList(orderDetailBizRequest); } @@ -172,9 +170,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { if (null == OrderDetailCodeRequest) { return Collections.emptyList(); } - if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) { - PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit()); - } + // 分页处理 + OrderDetailCodeRequest.pageDispose(); return ioOrderDetailBizDao.getfilterOrderList(OrderDetailCodeRequest); } @@ -232,9 +229,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { if (null == orderDetailBizRequest) { return Collections.emptyList(); } - if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) { - PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit()); - } + // 分页处理 + orderDetailBizRequest.pageDispose(); return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest); } @Override diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index eeda25f9..7e845509 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -84,9 +84,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { if (null == detailCodeRequest) { return Collections.emptyList(); } - if (null != detailCodeRequest.getPage() && null != detailCodeRequest.getLimit()) { - PageHelper.offsetPage((detailCodeRequest.getPage() - 1) * detailCodeRequest.getLimit(), detailCodeRequest.getLimit()); - } + // 分页处理 + detailCodeRequest.pageDispose(); return ioOrderDetailCodeDao.filterList(detailCodeRequest); } @@ -95,9 +94,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { if (null == detailCodeRequest) { return Collections.emptyList(); } - if (null != detailCodeRequest.getPage() && null != detailCodeRequest.getLimit()) { - PageHelper.offsetPage((detailCodeRequest.getPage() - 1) * detailCodeRequest.getLimit(), detailCodeRequest.getLimit()); - } + // 分页处理 + detailCodeRequest.pageDispose(); return ioOrderDetailCodeDao.filterDrugList(detailCodeRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 571d3cde..0b563046 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -57,9 +57,8 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic if (null == orderDetailResultRequest) { return Collections.emptyList(); } - if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) { - PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit()); - } + // 分页处理 + orderDetailResultRequest.pageDispose(); return orderDetailResultDao.filterList(orderDetailResultRequest); } @@ -68,9 +67,8 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic if (null == orderDetailResultRequest) { return Collections.emptyList(); } - if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) { - PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit()); - } + // 分页处理 + orderDetailResultRequest.pageDispose(); return orderDetailResultDao.filterOrderList(orderDetailResultRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index b8b78a3d..3d2e04e4 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -546,9 +546,8 @@ public class IoOrderServiceImpl implements IoOrderService { if (null == filterOrderRequest) { return Collections.emptyList(); } - if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { - PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); - } + // 分页处理 + filterOrderRequest.pageDispose(); return orderDao.filterList(filterOrderRequest); } @@ -557,9 +556,8 @@ public class IoOrderServiceImpl implements IoOrderService { if (null == filterOrderRequest) { return Collections.emptyList(); } - if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { - PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); - } + // 分页处理 + filterOrderRequest.pageDispose(); return orderDao.getfilterOrderList(filterOrderRequest); } @@ -568,9 +566,8 @@ public class IoOrderServiceImpl implements IoOrderService { if (null == filterOrderRequest) { return Collections.emptyList(); } - if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { - PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); - } + // 分页处理 + filterOrderRequest.pageDispose(); return orderDao.filterOrderList(filterOrderRequest); } @@ -825,9 +822,8 @@ public class IoOrderServiceImpl implements IoOrderService { } } - if (null != uploadOrderRequest.getPage() && null != uploadOrderRequest.getLimit()) { - PageHelper.offsetPage((uploadOrderRequest.getPage() - 1) * uploadOrderRequest.getLimit(), uploadOrderRequest.getLimit()); - } + // 分页处理 + uploadOrderRequest.pageDispose(); return orderDao.selectUploadOrder(uploadOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index 2562bd1b..c7823280 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -33,9 +33,8 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService { if (null == filterReceiveDetailRequest) { return Collections.emptyList(); } - if (null != filterReceiveDetailRequest.getPage() && null != filterReceiveDetailRequest.getLimit()) { - PageHelper.offsetPage((filterReceiveDetailRequest.getPage() - 1) * filterReceiveDetailRequest.getLimit(), filterReceiveDetailRequest.getLimit()); - } + // 分页处理 + filterReceiveDetailRequest.pageDispose(); return receiveDetailDao.filterList(filterReceiveDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index cd5809e1..2d9952e0 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -48,9 +48,8 @@ public class ReceiveServiceImpl implements ReceiveService { if (null == filterReceiveRequest) { return Collections.emptyList(); } - if (null != filterReceiveRequest.getPage() && null != filterReceiveRequest.getLimit()) { - PageHelper.offsetPage((filterReceiveRequest.getPage() - 1) * filterReceiveRequest.getLimit(), filterReceiveRequest.getLimit()); - } + // 分页处理 + filterReceiveRequest.pageDispose(); return receiveDao.filterList(filterReceiveRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java index ccaf3c41..3eb7fd1c 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java @@ -40,9 +40,8 @@ public class DeviceInspectTaskService extends ServiceImpl list = deviceReceiveOrderDetailDao.filterList(detailRequest); //设置是否可以自定义序列号标识 list.forEach(item -> { @@ -112,9 +111,8 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe if (null == detailRequest) { return Collections.emptyList(); } - if (null != detailRequest.getPage() && null != detailRequest.getLimit()) { - PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit()); - } + // 分页处理 + detailRequest.pageDispose(); return deviceReceiveOrderDetailDao.filterList(detailRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java index bc445fb1..8f54ad6c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java @@ -49,9 +49,8 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService if (null == deviceReceiveOrderRequest) { return Collections.emptyList(); } - if (null != deviceReceiveOrderRequest.getPage() && null != deviceReceiveOrderRequest.getLimit()) { - PageHelper.offsetPage((deviceReceiveOrderRequest.getPage() - 1) * deviceReceiveOrderRequest.getLimit(), deviceReceiveOrderRequest.getLimit()); - } + // 分页处理 + deviceReceiveOrderRequest.pageDispose(); return deviceReceiveOrderDao.filterList(deviceReceiveOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java index 13c2a025..c9b9c48f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java @@ -41,9 +41,8 @@ public class InvCountCodesServiceImpl implements InvCountCodesService { if (null == codesRequest) { return Collections.emptyList(); } - if (null != codesRequest.getPage() && null != codesRequest.getLimit()) { - PageHelper.offsetPage((codesRequest.getPage() - 1) * codesRequest.getLimit(), codesRequest.getLimit()); - } + // 分页处理 + codesRequest.pageDispose(); return invCountCodesDao.filterList(codesRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java index 78338b75..fe5966d7 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java @@ -38,9 +38,8 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic if (null == detailRequest) { return Collections.emptyList(); } - if (null != detailRequest.getPage() && null != detailRequest.getLimit()) { - PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit()); - } + // 分页处理 + detailRequest.pageDispose(); return invCountOrderDetailDao.filterList(detailRequest); } @@ -49,9 +48,8 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic if (null == detailRequest) { return Collections.emptyList(); } - if (null != detailRequest.getPage() && null != detailRequest.getLimit()) { - PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit()); - } + // 分页处理 + detailRequest.pageDispose(); return invCountOrderDetailDao.filterCountDetail(detailRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java index 8450d451..5d2e4087 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java @@ -92,9 +92,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { if (null == filterInvCountOrderRequest) { return Collections.emptyList(); } - if (null != filterInvCountOrderRequest.getPage() && null != filterInvCountOrderRequest.getLimit()) { - PageHelper.offsetPage((filterInvCountOrderRequest.getPage() - 1) * filterInvCountOrderRequest.getLimit(), filterInvCountOrderRequest.getLimit()); - } + // 分页处理 + filterInvCountOrderRequest.pageDispose(); return invCountOrderDao.filterList(filterInvCountOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java index 74da42a3..ec34a7e6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java @@ -47,9 +47,8 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { if (null == filterInvMAOrderDetailRequest) { return Collections.emptyList(); } - if (null != filterInvMAOrderDetailRequest.getPage() && null != filterInvMAOrderDetailRequest.getLimit()) { - PageHelper.offsetPage((filterInvMAOrderDetailRequest.getPage() - 1) * filterInvMAOrderDetailRequest.getLimit(), filterInvMAOrderDetailRequest.getLimit()); - } + // 分页处理 + filterInvMAOrderDetailRequest.pageDispose(); return invMAOrderDetailDao.filterList(filterInvMAOrderDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java index 6bd103e1..64723745 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java @@ -46,9 +46,8 @@ public class InvMAOrderServiceImpl implements InvMAOrderService { if (null == filterInvMAOrderRequest) { return Collections.emptyList(); } - if (null != filterInvMAOrderRequest.getPage() && null != filterInvMAOrderRequest.getLimit()) { - PageHelper.offsetPage((filterInvMAOrderRequest.getPage() - 1) * filterInvMAOrderRequest.getLimit(), filterInvMAOrderRequest.getLimit()); - } + // 分页处理 + filterInvMAOrderRequest.pageDispose(); return invMAOrderDao.filterList(filterInvMAOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 4903a57c..acba6247 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -41,9 +41,8 @@ public class InvPlaceServiceImpl implements InvPlaceService { if (null == filterInvPlaceRequest) { return Collections.emptyList(); } - if (null != filterInvPlaceRequest.getPage() && null != filterInvPlaceRequest.getLimit()) { - PageHelper.offsetPage((filterInvPlaceRequest.getPage() - 1) * filterInvPlaceRequest.getLimit(), filterInvPlaceRequest.getLimit()); - } + // 分页处理 + filterInvPlaceRequest.pageDispose(); return invProductNewDao.selectPlaceDetailList(filterInvPlaceRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index be50ade7..8852ca81 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -109,9 +109,8 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe if (null == invPreProductDetailRequest) { return Collections.emptyList(); } - if (null != invPreProductDetailRequest.getPage() && null != invPreProductDetailRequest.getLimit()) { - PageHelper.offsetPage((invPreProductDetailRequest.getPage() - 1) * invPreProductDetailRequest.getLimit(), invPreProductDetailRequest.getLimit()); - } + // 分页处理 + invPreProductDetailRequest.pageDispose(); return invPreInProductDetailDao.filterPreProductDetailList(invPreProductDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java index 8949acd7..e669f3aa 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java @@ -109,9 +109,8 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic if (null == invPreProductDetailRequest) { return Collections.emptyList(); } - if (null != invPreProductDetailRequest.getPage() && null != invPreProductDetailRequest.getLimit()) { - PageHelper.offsetPage((invPreProductDetailRequest.getPage() - 1) * invPreProductDetailRequest.getLimit(), invPreProductDetailRequest.getLimit()); - } + // 分页处理 + invPreProductDetailRequest.pageDispose(); return invPreProductDetailDao.filterPreProductDetailList(invPreProductDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java index e93f0f76..9a7b47bb 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java @@ -54,9 +54,8 @@ public class InvPreProductServiceImpl implements InvPreProductService { if (null == invPreProductRequest) { return Collections.emptyList(); } - if (null != invPreProductRequest.getPage()) { - PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); - } + // 分页处理 + invPreProductRequest.pageDispose(); return invPreProductDao.filterList(invPreProductRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java index 8e95ff3a..36130693 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java @@ -29,9 +29,8 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService { if (null == filterInvPreinDetailRequest) { return Collections.emptyList(); } - if (null != filterInvPreinDetailRequest.getPage() && null != filterInvPreinDetailRequest.getLimit()) { - PageHelper.offsetPage((filterInvPreinDetailRequest.getPage() - 1) * filterInvPreinDetailRequest.getLimit(), filterInvPreinDetailRequest.getLimit()); - } + // 分页处理 + filterInvPreinDetailRequest.pageDispose(); return invPreinDetailDao.filterList(filterInvPreinDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java index ff1d6c28..c278ce6f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java @@ -25,9 +25,8 @@ public class InvPreinOrderServiceImpl implements InvPreinOrderService { if (null == filterInvPreinRequest) { return Collections.emptyList(); } - if (null != filterInvPreinRequest.getPage() && null != filterInvPreinRequest.getLimit()) { - PageHelper.offsetPage((filterInvPreinRequest.getPage() - 1) * filterInvPreinRequest.getLimit(), filterInvPreinRequest.getLimit()); - } + // 分页处理 + filterInvPreinRequest.pageDispose(); return invPreinOrderDao.filterList(filterInvPreinRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java index 1fe6e475..3ccd6f53 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java @@ -53,9 +53,8 @@ public class InvPreinProductServiceImpl implements InvPreinProductService { if (null == invPreProductRequest) { return Collections.emptyList(); } - if (null != invPreProductRequest.getPage()) { - PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); - } + // 分页处理 + invPreProductRequest.pageDispose(); return invPreinProductDao.filterList(invPreProductRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java index d3560c79..f0ac0746 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java @@ -63,9 +63,8 @@ public class InvProductServiceImpl implements InvProductService { if (null == filterInvProductRequest) { return Collections.emptyList(); } - if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { - PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); - } + // 分页处理 + filterInvProductRequest.pageDispose(); return invProductDao.filterProductList(filterInvProductRequest); } @@ -75,9 +74,8 @@ public class InvProductServiceImpl implements InvProductService { if (null == filterInvProductRequest) { return Collections.emptyList(); } - if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { - PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); - } + // 分页处理 + filterInvProductRequest.pageDispose(); return invProductDao.filterList(filterInvProductRequest); } @@ -96,9 +94,8 @@ public class InvProductServiceImpl implements InvProductService { if (null == filterInvProductRequest) { return Collections.emptyList(); } - if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { - PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); - } + // 分页处理 + filterInvProductRequest.pageDispose(); return invProductDao.stockStatistics(filterInvProductRequest); } @@ -107,9 +104,8 @@ public class InvProductServiceImpl implements InvProductService { if (null == filterInvProductRequest) { return Collections.emptyList(); } - if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { - PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); - } + // 分页处理 + filterInvProductRequest.pageDispose(); return invProductDao.getMAInvProducts(filterInvProductRequest); } @@ -118,9 +114,8 @@ public class InvProductServiceImpl implements InvProductService { if (null == filterInvProductRequest) { return Collections.emptyList(); } - if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { - PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); - } + // 分页处理 + filterInvProductRequest.pageDispose(); return invProductDao.getCountInvProduct(filterInvProductRequest); } @@ -129,9 +124,8 @@ public class InvProductServiceImpl implements InvProductService { if (null == filterInvProductRequest) { return Collections.emptyList(); } - if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { - PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); - } + // 分页处理 + filterInvProductRequest.pageDispose(); return invProductDao.filterProductNames(filterInvProductRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java index 80b3225a..f4493981 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java @@ -81,9 +81,8 @@ public class InvProductServiceNew extends ServiceImpl list = invRemindSetDao.filterList(filterInvRemindSetRequest); if (CollUtil.isNotEmpty(list)) { list.forEach(invRemindSetResponse -> { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java index 210027a8..0ec38b47 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java @@ -60,9 +60,8 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { if (null == filterCertRemindMsgRequest || null == filterCertRemindMsgRequest.getType()) { return Collections.emptyList(); } - if (null != filterCertRemindMsgRequest.getPage() && null != filterCertRemindMsgRequest.getLimit()) { - PageHelper.offsetPage((filterCertRemindMsgRequest.getPage() - 1) * filterCertRemindMsgRequest.getLimit(), filterCertRemindMsgRequest.getLimit()); - } + // 分页处理 + filterCertRemindMsgRequest.pageDispose(); //根据类型查询预警信息 switch (filterCertRemindMsgRequest.getType()) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index 3b93a78f..2b211a76 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -25,9 +25,8 @@ public class SupCompanyServiceImpl extends ServiceImpl companyEntities = supCompanyDao.filterCompany(companyRequest); if (CollUtil.isNotEmpty(companyEntities)) { for (SupCompanyEntity companyEntity : companyEntities) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index 3b3af956..a78d0bed 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -39,9 +39,8 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl filterEnableList(FilterThrBusTypeOriginRequest filterThrBusTypeOriginRequest) { - if (null != filterThrBusTypeOriginRequest.getPage() && null != filterThrBusTypeOriginRequest.getLimit()) { - PageHelper.offsetPage((filterThrBusTypeOriginRequest.getPage() - 1) * filterThrBusTypeOriginRequest.getLimit(), filterThrBusTypeOriginRequest.getLimit()); - } + // 分页处理 + filterThrBusTypeOriginRequest.pageDispose(); return thrBusTypeOriginDao.filterEnableList(filterThrBusTypeOriginRequest); } @@ -50,9 +49,8 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl