研判分析中项目列表排除当前正在查看的项目

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java

@@ -24,6 +24,9 @@ public class ProjectAnalysisFormDTO implements Serializable {
     //一级分类Id集合
     @NotNull(message = "分类Code集合不能为空", groups = {Analysis.class})
     private List<String> categoryCodeList;
+    //当前查看的项目Id
+    @NotBlank(message = "当前查看项目Id不能为空", groups = {Analysis.class})
+    private String projectId;
 
     private String customerId;
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -539,7 +539,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 			});
 			//当前分类下来源楼院小组的项目
 			groupList.forEach(gr -> {
-				if (secondCodeMap.containsKey(gr.getCategoryCode())) {
+				if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) {
 					ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class);
 					groupPrList.add(project);
 				}
@@ -548,7 +548,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 			groupProjectList.add(groupCa);
 			//当前分类下来源事件上报的项目
 			eventList.forEach(gr -> {
-				if (secondCodeMap.containsKey(gr.getCategoryCode())) {
+				if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) {
 					ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class);
 					eventPrList.add(project);
 				}