From 37b697351e8e0a9200eee1276c4081c07588dc10 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 17 六月 2025 20:39:48 +0800
Subject: [PATCH] 未回款金额(元)为NaN修复
---
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 3c58664..9cab585 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -121,8 +121,8 @@
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- paymentRegistration.setTenantId(tenantId.longValue());
+ Long tenantId = loginUser.getTenantId();
+ paymentRegistration.setTenantId(tenantId);
paymentRegistration.setRegistrantId(loginUser.getUserId());
paymentRegistration.setCreateTime(DateUtils.getNowDate());
paymentRegistration.setUpdateTime(DateUtils.getNowDate());
@@ -288,6 +288,8 @@
detailPagination.put("pageSize", detailPageSize);
detailPagination.put("pages", (int) Math.ceil((double) totalDetails / detailPageSize));
+ // 搴斾粯閲戦閫昏緫涓嶉噰鐢ㄥ悎鍚岄噾棰濇敼鎴� 鍙戠エ閲戦鍑忎粯娆鹃噾棰�
+ payableAmount = invoiceAmount.subtract(paymentAmount);
res.put("invoiceAmount", invoiceAmount);
res.put("payableAmount", payableAmount);
res.put("paymentAmount", paymentAmount);
@@ -374,7 +376,6 @@
Collectors.toList()
)
);
- BigDecimal amountDateTotal = BigDecimal.ZERO;
for (LocalDate localDate : dateListMap.keySet()) {
BigDecimal currentPaymentAmount = BigDecimal.ZERO;
BigDecimal invoiceAmount = BigDecimal.ZERO;
--
Gitblit v1.9.3