From 355824ee9134486796db39cfd4a70e901079ee86 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 17:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40334?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectDetailServiceImpl.java        | 46 ++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index 1de59439..0013ce64 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.mapper.ProjectDetailMapper;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.vo.PayMailBillVO;
 import com.jero.common.vo.ProjectDetailVO;
@@ -27,15 +28,16 @@ import com.jero.mail.service.IPayMailBillService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
+import com.jero.project.entity.PayWorkingGroupDistributionRecord;
+import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
@@ -45,28 +47,30 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectDetailServiceImpl implements ProjectDetailService {
 
-    @Autowired
+    @Resource
     private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayCompanyManagementService payCompanyManagementService;
-    @Autowired
+    @Resource
     private IPayContactsManagementService payContactsManagementService;
-    @Autowired
+    @Resource
     private IPayPaymentRecordService payPaymentRecordService;
-    @Autowired
+    @Resource
     private IPayMailBillService payMailBillService;
     @Resource
     private ProjectDetailMapper projectDetailMapper;
-    @Autowired
+    @Resource
     private ISysBaseAPI sysBaseAPI;
-    @Autowired
+    @Resource
     private IPayIncomeContractService payIncomeContractService;
-    @Autowired
+    @Resource
     private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
-    @Autowired
+    @Resource
     private IPayMailBillProjectService payMailBillProjectService;
+    @Resource
+    private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
 
     @Override
     public ProjectDetailVO getProjectDetail(String projectId) {
@@ -78,6 +82,24 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
         if(Objects.isNull(payCommonProject)){
             throw new JeroBootException("项目不存在！");
         }
+        // 工作组项目资料
+        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,projectId);
+            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());
+            }
+        }
         ProjectDetailVO projectDetailVO = new ProjectDetailVO();
         projectDetailVO.setPrincipalName(payCommonProject.getPrincipalName());
         projectDetailVO.setReceivableAmount(payCommonProject.getReceivableAmount());