From 800fe7bbdcd513c06d23dd568850d8eb05dd4d63 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 14 十月 2026 15:17:19 +0800
Subject: [PATCH] feat:新增单位年度合同 开票 收款计划 新增统计页

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 2e83a50..fd9c413 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
@@ -54,13 +54,14 @@
 
 	}
 
-	private void saveScheduleProcess(ContractPaymentScheduleProcessAddDTO addDTO, ContractPaymentSchedule schedule) {
-		//灞ョ害
-		ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO, ContractPaymentScheduleProcess.class);
+	public void saveScheduleProcess(Date date, ContractPaymentSchedule schedule) {
+		//鏇存柊灞ョ害
+		ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
 		contractPaymentScheduleProcess.setContractId(schedule.getContractId());
 		contractPaymentScheduleProcess.setContractName(schedule.getContractName());
 		contractPaymentScheduleProcess.setScheduleId(schedule.getId());
 		contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
+		contractPaymentScheduleProcess.setProcessDate(date);
 		ContractPaymentScheduleProcess lastProcess = baseMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery().eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
 				.eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
 		if (ObjUtil.isNull(lastProcess)) {
@@ -89,7 +90,7 @@
 
 		updateCurrentSchedule(addDTO.getProcessDate(), schedule, contract);
 		//淇濆瓨灞ョ害璁板綍
-		saveScheduleProcess(addDTO, schedule);
+		saveScheduleProcess(addDTO.getProcessDate(), schedule);
 		return R.ok();
 	}
 
@@ -141,7 +142,7 @@
 	public void handleBeforeRemain(PaymentConfirm currentConfim, Contract contract) {
 		//瀹㈡埛浠樻瀹屾垚鍚堝悓
 		List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
-				.eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).eq(Contract::getContractStatus, 3));
+				.eq(Contract::getPartyBId, contract.getCompId()).eq(Contract::getContractStatus, 3));
 		if (CollUtil.isNotEmpty(customerCompleteContractList)) {
 			List<BigDecimal> outAmountList = new ArrayList<>();
 			for (Contract completeContract : customerCompleteContractList) {
@@ -158,6 +159,7 @@
 					outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
 					outConfirm.setTotalAmount(new BigDecimal("0"));
 					if (contract.getContractNo().startsWith("ZB-")) {
+						outConfirm.setCompId(contract.getCompId());
 						paymentConfirmMapper.insert(outConfirm);
 					}
 					outAmountList.add(contractLastConfirm.getTotalAmount());
@@ -178,6 +180,7 @@
 					inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
 				}
 				if (contract.getContractNo().startsWith("ZB-")) {
+					inConfirm.setCompId(contract.getCompId());
 					paymentConfirmMapper.insert(inConfirm);
 				}
 				contract.setPaidAmount(currentSum);

--
Gitblit v1.9.1