Merge branch 'dev_grid_platform' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -142,13 +142,14 @@ public class DataReportingServiceImpl implements DataReportingService {
 		Map<String, CustomerProjectCategoryDictEntity> epmetCodeMap = new HashMap<>();
 		Result<String> parentCustomer =  operCrmOpenFeignClient.getExternalAndParentCustomerId(formDTO.getCustomerId());
 		if (StringUtils.isNotBlank(parentCustomer.getData())) {
-			customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData());
+			epmetCodeMap = customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData());
 		}
 		Map<String, CustomerProjectCategoryDictEntity> codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());;
 		//项目ID不为空时，因为只有一条，可以直接处理
+		Map<String, CustomerProjectCategoryDictEntity> finalEpmetCodeMap = epmetCodeMap;
 		if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) {
 			list = projectList.stream().map(project -> {
-				EventInfoResultDTO dto = getEventInfoResultDTO(project, epmetCodeMap, codeMap);
+				EventInfoResultDTO dto = getEventInfoResultDTO(project, finalEpmetCodeMap, codeMap);
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(project.getOrgId());
 					dto.setOrgId(project.getOrgId());
@@ -167,7 +168,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 			Map<String, ScreenCustomerAgencyEntity> agencyMap = screenCustomerAgencyService.getAgencyList(formDTO.getCustomerId());
 			Map<String, ScreenCustomerGridDTO> gridMap = screenCustomerGridService.getGridList(formDTO.getCustomerId());
 			list = projectList.stream().map(project -> {
-				EventInfoResultDTO dto = getEventInfoResultDTO(project, epmetCodeMap, codeMap);
+				EventInfoResultDTO dto = getEventInfoResultDTO(project, finalEpmetCodeMap, codeMap);
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = agencyMap.get(project.getOrgId());
 					dto.setOrgId(project.getOrgId());
@@ -182,7 +183,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 				return dto;
 			}).collect(Collectors.toList());
 		}
-		return list.stream().filter(item -> StringUtils.isNotBlank(item.getEventCategory())).collect(Collectors.toList());
+		return list.stream().filter(item -> StringUtils.isNotBlank(item.getParentEventCategory())).collect(Collectors.toList());
 	}
 
 	private EventInfoResultDTO getEventInfoResultDTO(ScreenProjectDataDTO project, Map<String, CustomerProjectCategoryDictEntity> epmetCodeMap, Map<String, CustomerProjectCategoryDictEntity> codeMap) {