From 035ce37565afdb4a832be98f9b30601866cb649a Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Sun, 17 May 2020 15:21:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomerOrderServiceImpl.java | 3 +++ .../productCount/service/impl/ProductCountServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java index bec54299..92b4e80c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java @@ -143,6 +143,9 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { customerOrderDTO.setCustomerOrderProductList(customerOrderProductDTOList); String procStatus = customerOrderDTO.getProcStatus(); ProcStatusEnum procStatusEnum = ProcStatusEnum.getProcStatusEnum(procStatus); + if(null == procStatusEnum){ + procStatusEnum = ProcStatusEnum.WAIT_SEND_GOOD; + } if(null != procStatusEnum){ customerOrderDTO.setProcStatusName(procStatusEnum.getName()); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/sr/productCount/service/impl/ProductCountServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/sr/productCount/service/impl/ProductCountServiceImpl.java index 65d9fbc3..a55e8660 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/sr/productCount/service/impl/ProductCountServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/sr/productCount/service/impl/ProductCountServiceImpl.java @@ -62,8 +62,8 @@ public class ProductCountServiceImpl implements ProductCountService { List targetPredicateList = new ArrayList<>(); - Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); - targetPredicateList.add(statusPredicate); +// Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); +// targetPredicateList.add(statusPredicate); if(!StringUtils.isEmpty(criteria.getProductName())){ @@ -91,7 +91,7 @@ public class ProductCountServiceImpl implements ProductCountService { } }; - Page page = productCountRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + Page page = productCountRepository.findAll(specification, pageable); return PageUtil.toPage(page.map(productCountMapper::toDto)); }