From 5f2cfee50793ebf0af473afb252fcfb606320c36 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 7 Aug 2024 10:23:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=2088139=20=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E6=AF=94=E5=AE=9E?=
 =?UTF-8?q?=E6=94=B6=E5=B0=8F=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E6=8A=A5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=90=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/service/ITbMemberProjectSubitemService.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 2774ad6e..d7a4ad2b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -13,12 +13,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.ProjectDetailService;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ValidUtil;
+import com.jero.common.vo.ProjectStatusVO;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
@@ -122,6 +124,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 	private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
 	@Resource
 	private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
+	@Autowired
+	private ProjectDetailService projectDetailService;
 	/**
 	 * 保存
 	 */
@@ -439,6 +443,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			throw new JeroBootException("会员单位不可变更");
 		}
 		setSubitemEdit(tbMemberProjectSubitem,subitemOld,annualDataLocking);
+		// 变更待确收金额，重新校验状态
+		ProjectStatusVO projectStatusVO = projectDetailService.getStatus(subitemId,tbMemberProjectSubitem.getAmountReceivable(),tbMemberProjectSubitem.getInvoiceRequirements());
+
 		// 校验项目是否已关联合同
 		PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(subitemId);
 		if (!Objects.isNull(payIncomeContract)) {