From c69c3cce2ed6c6257f595a0f8acd531161d41a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 11 Oct 2021 14:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BF=AE=E6=94=B9#4?=
 =?UTF-8?q?0339?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCommonProjectController.java           | 27 ++++++++++++++++++-
 ...ingGroupDistributionRecordServiceImpl.java |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)

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 dd092a16..8fcf0781 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
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.common.ProjectCommon;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
@@ -43,10 +44,12 @@ import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayCompanyCommonProject;
+import com.jero.project.entity.PayWorkingGroupDistributionRecord;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
 import com.jero.project.vo.PayCommonProjectOutput;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -58,7 +61,9 @@ import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+import static com.sun.tools.attach.VirtualMachine.list;
+
+/**
  * @Description: 普通项目管理
  * @Author: jeecg-boot
  * @Date:   2021-08-27
@@ -91,6 +96,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private IPayMailBillProjectService payMailBillProjectService;
 	@Resource
 	private IPayPaymentRecordService payPaymentRecordService;
+	@Resource
+	private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
 	 /**
 	 * 分页列表查询
 	 *
@@ -421,6 +428,24 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		 if(Objects.isNull(payCommonProject)){
 			 return Result.error("项目不存在!");
 		 }
+		 // 工作组项目资料
+		 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);
+			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId());
+		 	 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());
+			 }
+		 }
 		 String strProject = JSON.toJSONString(payCommonProject);
 		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
 		 if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
index c1748c47..4b9d811f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
@@ -233,6 +233,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 // 文件路径
                 String url = byId.getUrl();
                 listFile.add(path + url);
+                payWorkingGroupDistributionRecord.setDataId(p.getId());
                 setRecord( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId);
             });
             LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();