From 4dbd65ead93823f2e31847667e3ecf454700ab04 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 10:37:31 +0800
Subject: [PATCH] 增加搜索条件
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
index 45c4a2b..d422d8b 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
@@ -160,6 +160,7 @@
estimatedReceivableBillLog.setOperation("淇敼璐﹀崟鍚嶇О涓�"+estimatedReceivableBill.getBillName());
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
pendingSettlementBusinessMapper.updatePendingSettlementBusinessByBillId(estimatedReceivableBill.getId(),estimatedReceivableBill.getBillName());
+
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
@@ -230,7 +231,7 @@
estimatedReceivableBillLog.setOperation("鏈鎻愪氦閲戦"+ settlementAmount);
estimatedReceivableBillLog.setFileName(estimatedReceivableBill.getAttachment());
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
- settledAmount = settledAmount.add(settlementAmount);
+
List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
// 妫�鏌ュ綋鍓嶆彁浜ら噾棰�+宸茬粨绠楅噾棰濇槸鍚﹁秴杩囧簲缁撶畻閲戦
if (settlementAmount.add(settledAmount).compareTo(totalAmount) > 0) {
@@ -241,11 +242,15 @@
//宸茬粨绠楀ぇ浜庡簲璁＄畻閲戦涓哄凡缁撶畻
estimatedReceivableBill.setStatus(2);
estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
+ pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
}else {
//鍚﹀垯閮ㄥ垎缁撶畻
estimatedReceivableBill.setStatus(1);
estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
+ pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
}
+ settledAmount = settledAmount.add(settlementAmount);
+ estimatedReceivableBill.setSettledAmount(settledAmount);
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
--
Gitblit v1.8.0