From e0cc9278a0bcbf480446f87a78b9d7ddd8819eeb Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java
index e942a58..90b16c2 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java
@@ -320,7 +320,7 @@
estimatedReceivableBill.setCreateBy(username);
estimatedReceivableBillMapper.insertEstimatedReceivableBill(estimatedReceivableBill);
//淇敼鍏ヨ处
- estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1,createBillVo.getBillName());
//淇敼璋冨害鍗曚负宸插垱寤鸿处鍗�
return pendingSettlementBusinessMapper.updatePendingSettlementBusinessIsCreate(collect,estimatedReceivableBill.getId(),createBillVo.getBillName());
@@ -366,7 +366,7 @@
estimatedReceivableBill.setCreateBy(username);
estimatedReceivableBillMapper.insertEstimatedReceivableBill(estimatedReceivableBill);
//淇敼搴旀敹绠＄悊琛ㄥ凡鍏ヨ处
- estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1,billName);
//淇敼璋冨害鍗曚负宸插垱寤鸿处鍗�
return pendingSettlementBusinessMapper.updatePendingSettlementBusinessIsCreate(collect,estimatedReceivableBill.getId(),billName);
}
--
Gitblit v1.8.0