From 2a8729301fa0e4b20a2cf14273790cd3640ae5a6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 22 一月 2026 17:36:08 +0800
Subject: [PATCH] yys 巡检管理修改
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index ad0b5e2..3398347 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -237,6 +237,9 @@
.in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList())));
}
for (SalesLedger salesLedger : iPage.getRecords()) {
+ if(salesLedger.getShippingDate() != null){
+ salesLedger.setShippingStatus("宸插彂璐�");
+ }
boolean existFlag = false;
BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
BigDecimal invoiceTotal = BigDecimal.ZERO;
@@ -277,8 +280,9 @@
}
if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
if (salesLedgerDto.getStatus()) {
+ long count = iPage.getRecords().stream().filter(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00"))).count();
iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
- iPage.setTotal(iPage.getRecords().size());
+ iPage.setTotal(iPage.getTotal() - count);
}
}
--
Gitblit v1.9.3