From b967d23ae6c1f7761feb3c5328e3b591df6a735d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 26 八月 2026 10:51:41 +0800
Subject: [PATCH] feat:进行中合同导入
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
index 1529de8..1bb9245 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
@@ -138,7 +138,8 @@
PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,completeContract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
//鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
- if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0&&
+ contract.getContractNo().startsWith("ZB-")){
//鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
"advanceAmount","receivableAmount","overdueAmount","totalAmount");
@@ -167,13 +168,16 @@
}else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
}
- paymentConfirmMapper.insert(inConfirm);
+ if (contract.getContractNo().startsWith("ZB-")) {
+ paymentConfirmMapper.insert(inConfirm);
+ }
}
}
}
}
currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
- if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0&&
+ contract.getContractNo().startsWith("ZB-")) {
paymentConfirmMapper.insert(currentConfim);
//鏇存柊褰撳墠闃舵浠樻鎯呭喌
if (lastTotal.compareTo(new BigDecimal("0"))>0){
@@ -222,7 +226,7 @@
lastNewTotal = lastNewConfirm.getTotalAmount();
}
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0&&contract.getContractNo().startsWith("ZB-")){
paymentConfirmMapper.insert(newConfim);
}
@@ -276,7 +280,7 @@
lastTotal = lastConfirm.getTotalAmount();
}
currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
- if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0&&contract.getContractNo().startsWith("ZB-")){
paymentConfirmMapper.insert(currentConfim);
//鏇存柊褰撳墠闃舵浠樻鎯呭喌
if (lastTotal.compareTo(new BigDecimal("0"))>0){
@@ -388,7 +392,7 @@
lastNewTotal = lastNewConfirm.getTotalAmount();
}
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0&&contract.getContractNo().startsWith("ZB-")) {
paymentConfirmMapper.insert(newConfim);
//鏇存柊褰撳墠闃舵浠樻鎯呭喌
if (lastNewTotal.compareTo(new BigDecimal("0"))>0){
--
Gitblit v1.9.1