From 5e451afc663b95a2f54ee77e10f83f89e69af0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 15 Jan 2024 17:30:42 +0800
Subject: [PATCH] fix:80828

---
 .../PayCommonProjectController.java           | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

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 c757dcce..0647de4f 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
@@ -25,6 +25,8 @@ import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.entity.PayIncomeContractAssociated;
 import com.jero.contract.service.IPayIncomeContractAssociatedService;
 import com.jero.contract.service.IPayIncomeContractService;
+import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
+import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
 import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.service.IPayMailBillProjectService;
@@ -102,6 +104,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private RolePermissionService rolePermissionService;
 	@Resource
 	private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
+	@Resource
+	private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService;
 	 /**
 	 * 分页列表查询
 	 *
@@ -461,9 +465,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 			 }
 		 }
 		 // 工作组项目资料
-		 // 起草组项目资料
-		 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)
-		 	|| Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){
+		 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){
 			 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 	 LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
 			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id);
@@ -494,6 +496,38 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 
 		 }
 
+		 // 起草组项目资料
+		 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){
+			 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			 LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
+			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id);
+			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId());
+			 queryPayWorkingGroupDistributionRecord.groupBy(PayWorkingGroupDistributionRecord::getFileId);
+			 List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.list(queryPayWorkingGroupDistributionRecord);
+			 if(!CollectionUtils.isEmpty(listPayWorkingGroupDistributionRecord)){
+				 StringBuilder sb = new StringBuilder();
+				 listPayWorkingGroupDistributionRecord.forEach(p->{
+					 sb.append(p.getFileId());
+					 if(listPayWorkingGroupDistributionRecord.indexOf(p) != (listPayWorkingGroupDistributionRecord.size() - 1)){
+						 sb.append(",");
+					 }
+				 });
+				 payCommonProject.setFiles(sb.toString());
+			 }
+			 LambdaQueryWrapper<PayDraftingGroupSubItemContacts> queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>();
+			 queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,id);
+			 List<PayDraftingGroupSubItemContacts> pwg = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts);
+			 if(!CollectionUtils.isEmpty(pwg)){
+				 pwg.sort(Comparator.comparing(PayDraftingGroupSubItemContacts::getOrderNum));
+				 payCommonProject.setContactsTemporaryId(pwg.get(0).getContactsTemporaryId());
+				 payCommonProject.setContactsTemporaryName(pwg.get(0).getContactsTemporaryName());
+			 }else{
+				 payCommonProject.setContactsTemporaryId("");
+				 payCommonProject.setContactsTemporaryName("");
+			 }
+
+		 }
+
 		 String strProject = JSON.toJSONString(payCommonProject);
 		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
 		 if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){