Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -155,7 +155,10 @@ 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);