From 3e03f3d957c44ff2e4909b9fb4fff8621d466d10 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期五, 06 六月 2025 17:05:23 +0800 Subject: [PATCH] 分页修改 --- src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java index 3f96818..ca69eef 100644 --- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java +++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java @@ -214,7 +214,7 @@ .map(PurchaseLedger::getId) .filter(Objects::nonNull) .flatMap(id -> salesLedgerProductMapper.selectList( - new QueryWrapper<SalesLedgerProduct>().eq("sales_ledger_id", id) + new QueryWrapper<SalesLedgerProduct>().eq("sales_ledger_id", id).eq("type",2) ).stream()) .collect(Collectors.toList()); payableAmount = salesLedgerProducts.stream() @@ -363,20 +363,46 @@ @Override public List<PaymentHistoryRecordVo> getPaymentRecordList(Long supplierId) { List<PaymentHistoryRecordVo> paymentRecordList = paymentRegistrationMapper.getPaymentRecordList(supplierId); - if(!CollectionUtils.isEmpty(paymentRecordList)) { - // 搴斾粯閲戦璁$畻 - BigDecimal amountTotal = BigDecimal.ZERO; - for (PaymentHistoryRecordVo paymentHistoryRecordVo : paymentRecordList) { - if(paymentHistoryRecordVo.getType() == 0){ - amountTotal = amountTotal.subtract(paymentHistoryRecordVo.getCurrentPaymentAmount()); - } - if(paymentHistoryRecordVo.getType() == 1){ - amountTotal = amountTotal.add(paymentHistoryRecordVo.getInvoiceAmount()); - } + List<PaymentHistoryRecordVo> result = new ArrayList<>(); + // 搴斾粯鎬婚噾棰濋噾棰濊绠� + BigDecimal amountTotal = BigDecimal.ZERO; + if(CollectionUtils.isNotEmpty(paymentRecordList)) { + Map<LocalDate, List<PaymentHistoryRecordVo>> dateListMap = paymentRecordList.stream().collect( + Collectors.groupingBy( + PaymentHistoryRecordVo::getHappenTime, + LinkedHashMap::new, + Collectors.toList() + ) + ); + BigDecimal amountDateTotal = BigDecimal.ZERO; + for (LocalDate localDate : dateListMap.keySet()) { + BigDecimal currentPaymentAmount = BigDecimal.ZERO; + BigDecimal invoiceAmount = BigDecimal.ZERO; + BigDecimal currentDateTotal = BigDecimal.ZERO; + List<PaymentHistoryRecordVo> paymentHistoryRecordVos = dateListMap.get(localDate); + // 璁$畻褰撳ぉ姹囨鏁� + currentPaymentAmount = paymentHistoryRecordVos.stream() + .filter(item ->item.getType() == 0) + .map(PaymentHistoryRecordVo::getCurrentPaymentAmount) + .reduce(BigDecimal.ZERO,BigDecimal::add); + // 璁$畻浠婂ぉ鏉ョエ鏁� + invoiceAmount = paymentHistoryRecordVos.stream() + .filter(item ->item.getType() == 1) + .map(PaymentHistoryRecordVo::getInvoiceAmount) + .reduce(BigDecimal.ZERO,BigDecimal::add); + // 璁$畻褰撴棩姹囨�� + currentDateTotal = currentDateTotal.add(invoiceAmount).subtract(currentPaymentAmount); + PaymentHistoryRecordVo paymentHistoryRecordVo = new PaymentHistoryRecordVo(); + paymentHistoryRecordVo.setHappenTime(localDate); + paymentHistoryRecordVo.setCurrentPaymentAmount(currentPaymentAmount); + paymentHistoryRecordVo.setInvoiceAmount(invoiceAmount); + amountTotal = amountTotal.add(currentDateTotal); paymentHistoryRecordVo.setPayableAmount(amountTotal); + result.add(paymentHistoryRecordVo); } + } - return paymentRecordList; + return result; } // 鎵归噺鏌ヨ閲囪喘鍙拌处锛堝綋鏈堬級 -- Gitblit v1.9.3