From e3588d4435ebec31304578ebfe79f9a046a67a03 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 15 八月 2025 15:45:54 +0800
Subject: [PATCH] 修改关联
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 c8c528b..2b0ab09 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
@@ -1,5 +1,6 @@
package com.ruoyi.cwgl.service.impl;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -146,6 +147,19 @@
public int updateEstimatedReceivableBill(EstimatedReceivableBill estimatedReceivableBill)
{
estimatedReceivableBill.setUpdateTime(DateUtils.getNowDate());
+
+ return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
+ }
+
+ @Override
+ public int updateEstimatedReceivableBillName(EstimatedReceivableBill estimatedReceivableBill) {
+ EstimatedReceivableBillLog estimatedReceivableBillLog = new EstimatedReceivableBillLog();
+ estimatedReceivableBillLog.setCreateTime(new Date());
+ estimatedReceivableBillLog.setBillId(estimatedReceivableBill.getId());
+ estimatedReceivableBillLog.setCreateBy(SecurityUtils.getUsername());
+ estimatedReceivableBillLog.setOperation("淇敼璐﹀崟鍚嶇О涓�"+estimatedReceivableBill.getBillName());
+ logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
+ pendingSettlementBusinessMapper.updatePendingSettlementBusinessByBillId(estimatedReceivableBill.getId(),estimatedReceivableBill.getBillName());
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
@@ -202,11 +216,11 @@
Integer id = estimatedReceivableBill.getId();
EstimatedReceivableBill oldData = estimatedReceivableBillMapper.selectEstimatedReceivableBillById(id);
//搴旂粨绠楅噾棰�
- Long totalAmount = oldData.getTotalAmount()==null?0L:oldData.getTotalAmount();
+ BigDecimal totalAmount = oldData.getTotalAmount()==null?BigDecimal.ZERO:oldData.getTotalAmount();
//宸茬粨绠楅噾棰�
- Long settledAmount = oldData.getSettledAmount()==null?0L:oldData.getSettledAmount();
+ BigDecimal settledAmount = oldData.getSettledAmount()==null?BigDecimal.ZERO:oldData.getSettledAmount();
//褰撳墠鎻愪氦閲戦
- Long settlementAmount = estimatedReceivableBill.getSettlementAmount();
+ BigDecimal settlementAmount = estimatedReceivableBill.getSettlementAmount();
EstimatedReceivableBillLog estimatedReceivableBillLog = new EstimatedReceivableBillLog();
estimatedReceivableBill.setSettledAmount(settlementAmount);
@@ -214,10 +228,11 @@
estimatedReceivableBillLog.setBillId(estimatedReceivableBill.getId());
estimatedReceivableBillLog.setCreateBy(SecurityUtils.getUsername());
estimatedReceivableBillLog.setOperation("鏈鎻愪氦閲戦"+ settlementAmount);
+ estimatedReceivableBillLog.setFileName(estimatedReceivableBill.getAttachment());
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
- settledAmount = settledAmount+settlementAmount;
+ settledAmount = settledAmount.add(settlementAmount);
List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
- if (settledAmount>totalAmount){
+ if (settledAmount.compareTo(totalAmount) > 0){
//宸茬粨绠楀ぇ浜庡簲璁＄畻閲戦涓哄凡缁撶畻
estimatedReceivableBill.setStatus(2);
estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
@@ -239,8 +254,8 @@
EstimatedReceivableBill estimatedReceivableBill = estimatedReceivableBillMapper.selectEstimatedReceivableBillById(billId);
estimatedReceivableBill.setDispatchCount(estimatedReceivableBill.getDispatchCount()-1);
//搴旂粨绠楅噾棰濅慨鏀�
- Long totalAmount = estimatedReceivableBill.getTotalAmount();
- estimatedReceivableBill.setTotalAmount(totalAmount-pendingSettlementBusiness.getEstimatedTotalIncome());
+ BigDecimal totalAmount = estimatedReceivableBill.getTotalAmount();
+ estimatedReceivableBill.setTotalAmount(totalAmount.subtract(pendingSettlementBusiness.getEstimatedTotalIncome()));
EstimatedReceivableBillLog estimatedReceivableBillLog = new EstimatedReceivableBillLog();
estimatedReceivableBillLog.setCreateTime(new Date());
estimatedReceivableBillLog.setBillId(billId);
--
Gitblit v1.8.0