From 7d9315967cf26bf3dbf4a410dfc24f5b5ad79c57 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 6 Sep 2023 10:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NcrTrackServiceImpl.java     | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index 860beccf3..96d04a51d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -11,6 +11,8 @@ import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.project.entity.ProblemManagementEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
@@ -85,6 +87,8 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
     private ProblemManagementEOMapper problemManagementEOMapper;
     @Autowired
     private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
+    @Autowired
+    private IOSSFileService iOSSFileService;
 
     @Override
     public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
@@ -370,9 +374,30 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         }else{
             managementEOList = problemManagementEOService.list();
         }
+        //法规
         List<String> lawsIdList = managementEOList.stream()
                 .filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList());
-        List<String> projectIdList = managementEOList.stream().filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList());
+        //项目
+        List<String> projectIdList = managementEOList.stream()
+                .filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList());
+        //相关文件
+        List<String> fileList = managementEOList.stream()
+                .filter(e -> StringUtils.isNotBlank(e.getFile())).map(ProblemManagementEO::getFile).collect(Collectors.toList());
+        //审批证据
+        List<String> approvalEvidenceList = managementEOList.stream()
+                .filter(e -> StringUtils.isNotBlank(e.getApprovalEvidence())).map(ProblemManagementEO::getApprovalEvidence).collect(Collectors.toList());
+        List<String> connectList = new ArrayList<>();
+        if(!fileList.isEmpty()){
+            connectList.addAll(fileList);
+        }
+        if(!approvalEvidenceList.isEmpty()){
+            connectList.addAll(approvalEvidenceList);
+        }
+        List<OSSFile> fileInfoList = new ArrayList<>();
+        if(!connectList.isEmpty()){
+            fileInfoList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(connectList,","));
+        }
+
         List<BussDocumentLibraryEO> documentLibraryEOList = new ArrayList<>();
         if(!lawsIdList.isEmpty()){
             Set<String> lawIdSet = new HashSet<>();
@@ -472,7 +497,18 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                 }
                 problemManagementEO.setProgressTrackingList(list);
             }
-
+            //相关文件
+            if(StringUtils.isNotBlank(problemManagementEO.getFile())){
+                List<OSSFile> collect = fileInfoList.stream()
+                        .filter(e -> e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList());
+                problemManagementEO.setFileList(collect);
+            }
+            //审批证据
+            if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){
+                List<OSSFile> collect = fileInfoList.stream()
+                        .filter(e -> e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList());
+                problemManagementEO.setApprovalEvidenceFileList(collect);
+            }
             NcrTrackVO ncrTrackVOTemp = new NcrTrackVO();
             BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp);
             ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId());