From f00eccabbe51e4d849baa014cc45f5a9a8355f87 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 25 Mar 2021 14:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/DemoController.java    | 4 ++--
 .../ScreenGrassrootsGovernDataAbsorptionServiceImpl.java  | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 4bb409b6eb..7d2cf24432 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -806,14 +806,14 @@ public class DemoController {
         return new Result();
     }
 
-    /*@Autowired
+    @Autowired
     private ScreenGrassrootsGovernDataAbsorptionService ndddYhjfService;
 
     @PostMapping("diff")
     public Result diff(@RequestBody ScreenCentralZoneDataFormDTO param){
         ndddYhjfService.difficultyDataHub(param);
         return new Result();
-    }*/
+    }
 
     @Autowired
     private ScreenProjectSettleService screenProjectSettleService;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
index 05ab26289b..ebb8c7fad5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
@@ -155,10 +155,12 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         //最近一次操作
         Map<String, ProjectLatestOperationResultDTO> latestOperationMap = projectProcessService.getLatestOperation(projectIds,param.getCustomerId());
         //图片
-        List<ProjectSourceMapFormDTO> projectSourceMap = factOriginProjectMainDailyService.getNewProject(param.getCustomerId(),projectIds);
+        List<ProjectSourceMapFormDTO> projectSourceMap = difficulties.stream().map(diff->{
+            ProjectSourceMapFormDTO map = new ProjectSourceMapFormDTO();map.setProjectId(diff.getEventId());map.setSourceId(diff.getEventImgUrl());return map;
+        }).collect(Collectors.toList());
+        //factOriginProjectMainDailyService.getNewProject(param.getCustomerId(),projectIds);
 
-        Map<String,List<ScreenDifficultyImgDataEntity>> imgMap =
-                topicService.getTopicImgs(projectSourceMap);
+        Map<String,List<ScreenDifficultyImgDataEntity>> imgMap = topicService.getTopicImgs(projectSourceMap);
 
         Map<String,String> contentMap = topicService.getTopicContent(projectSourceMap);