From ae0ef253a738cee3a34a6ce22c0a324bbc6e3e9f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Feb 2021 16:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E6=9A=82?=
 =?UTF-8?q?=E5=AD=981?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/impl/ProjectServiceImpl.java       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
index 9c2336d992..3daf34aa23 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
@@ -27,6 +27,7 @@ import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
 import com.epmet.project.dto.result.ProjectDetailResultDTO;
 import com.epmet.project.dto.result.*;
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +43,7 @@ import java.util.List;
  * @Author sun
  * @Description 数据-项目
  **/
+@Slf4j
 @Service
 public class ProjectServiceImpl implements ProjectService {
 
@@ -197,10 +199,22 @@ public class ProjectServiceImpl implements ProjectService {
      */
     @Override
     public ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO) {
-        ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataService.projectDetail(processListFormDTO);
+        /*ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataService.projectDetail(processListFormDTO);
         if (null == projectDetailResultDTO) {
             return new ProjectDetailResultDTO();
-        }
+        }*/
+        ProjectDetailResultDTO projectDetailResultDTO=new ProjectDetailResultDTO();
+        //todo
+        /*Result<ProjectInfoDTO> result=govProjectOpenFeignClient.queryProjectInfoByProjectId(processListFormDTO.getProjectId());
+        if(result.success()&&null!=result.getData()){
+            ProjectInfoDTO projectInfoDTO=result.getData();
+            projectDetailResultDTO.setImgUrlList(projectInfoDTO.getImgUrlList());
+            projectDetailResultDTO.setEventSource(projectInfoDTO.getFromGridName());
+            projectDetailResultDTO.setEventTitle(projectInfoDTO.getEventTitle());
+            projectDetailResultDTO.setEventContent(projectInfoDTO.getEventContent());
+        }else{
+            log.warn(String.format("项目信息查询失败,projectId:%s",processListFormDTO.getProjectId()));
+        }*/
         Result<ProcessAndCurrentDeptResultDTO> processList = govProjectOpenFeignClient.getProcessList(processListFormDTO);
         if (!processList.success()) {
             throw new RenException(ProjectConstant.PROCESS_FAILURE);