From 9b273e88358718447d94c921bfc5caa7b1cd6f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sat, 9 Oct 2021 14:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCommonProjectController.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index e03927ea..25d38137 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -423,6 +423,24 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		 }
 		 String strProject = JSON.toJSONString(payCommonProject);
 		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
+
+		 // 合同编号查找合同id
+		 if(!StringUtils.isBlank(payCommonProject.getContractNum())){
+			 LambdaQueryWrapper<PayIncomeContract> query = new LambdaQueryWrapper<>();
+			 query.eq(PayIncomeContract::getContractNum,payCommonProject.getContractNum());
+			 List<PayIncomeContract> list = payIncomeContractService.list(query);
+			 if(!CollectionUtils.isEmpty(list)){
+				 // 查看是否有关联
+				 LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
+				 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getContractId,list.get(0).getId());
+				 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectId,id);
+				 List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
+				 if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
+					 payCompanyCommonProject.setContractId(list.get(0).getId());
+				 }
+			 }
+		 }
+
 		 // 到账信息
 		 LambdaQueryWrapper<PayPaymentRecord> queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>();
 		 queryWrapperPayPaymentRecord.eq(PayPaymentRecord::getProjectId,id);