From e7e5cac0bb6bf930c83d0c023701630c6ce4cb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 7 Jun 2023 17:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8F=91=E7=A5=A8=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 6 +- .../com/glxp/api/dao/inout/IoOrderDao.java | 2 + .../api/dao/inout/IoOrderDetailBizDao.java | 2 + .../inout/IoOrderDetailBizService.java | 2 + .../api/service/inout/IoOrderService.java | 2 + .../impl/IoOrderDetailBizServiceImpl.java | 11 + .../inout/impl/IoOrderServiceImpl.java | 11 + .../mybatis/mapper/inout/IoOrderDao.xml | 235 +++++++++++++++--- .../mapper/inout/IoOrderDetailBizDao.xml | 24 ++ 9 files changed, 250 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 6144db73..b1bbd080 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -146,7 +146,7 @@ public class IoOrderController extends BaseController { if (!customerId.equals("110")) { filterOrderRequest.setFromCorp(customerId); } - List list = orderService.getfilterList(filterOrderRequest); + List list = orderService.getfilterOrderList(filterOrderRequest); for (IoOrderResponse ioOrderResponse : list) { if (ioOrderResponse.getCheckStatus() == null) { @@ -154,7 +154,7 @@ public class IoOrderController extends BaseController { } FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest(); filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo()); - List ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest); + List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(filterOrderDetailCodeRequest); BigDecimal amount = new BigDecimal(0.00); for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) { @@ -162,8 +162,6 @@ public class IoOrderController extends BaseController { } } ioOrderResponse.setAllAmount(amount); - - } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index b2cfe5dc..ad9882b8 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -22,6 +22,8 @@ public interface IoOrderDao extends BaseMapperPlus getfilterList(FilterOrderRequest filterOrderRequest); + List getfilterOrderList(FilterOrderRequest filterOrderRequest); + /** * 查询单据实体列表 * diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index b4e93ab5..d183c89e 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -23,6 +23,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); IoOrderInvoiceResponse selectByinvoiceId(Long id); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index a8853daf..c85b5250 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -38,6 +38,8 @@ public interface IoOrderDetailBizService { List getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); + IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk); List checkOrderList(String orderId); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 3c117440..203651bf 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -56,6 +56,8 @@ public interface IoOrderService { List getfilterList(FilterOrderRequest filterOrderRequest); + List getfilterOrderList(FilterOrderRequest filterOrderRequest); + /** * 查询单据列表 * 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 1c27807a..70ced51f 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 @@ -132,6 +132,17 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest); } + @Override + public List getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { + if (null == OrderDetailCodeRequest) { + return Collections.emptyList(); + } + if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) { + PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit()); + } + return ioOrderDetailBizDao.getfilterOrderList(OrderDetailCodeRequest); + } + @Override public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) { QueryWrapper ew = new QueryWrapper<>(); 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 b1d62bd0..f75079d0 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,6 +546,17 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.getfilterList(filterOrderRequest); } + @Override + public List getfilterOrderList(FilterOrderRequest filterOrderRequest) { + if (null == filterOrderRequest) { + return Collections.emptyList(); + } + if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { + PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); + } + return orderDao.getfilterOrderList(filterOrderRequest); + } + @Override public List filterOrderList(FilterOrderRequest filterOrderRequest) { if (null == filterOrderRequest) { diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 0d4bb3f2..fc6e2c55 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -2,85 +2,88 @@ select * from io_order @@ -407,4 +412,152 @@ from io_order where billNo = #{billNo} + + + + + + + + + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 122998d2..cf3d5258 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -111,4 +111,28 @@ + + +