|
@@ -58,13 +58,9 @@ public class BusinessReportPowerInfoServiceImpl implements com.persagy.apm.energ
|
|
|
|
|
|
List<String> projectIds = reportOutlineService.queryRelatedProjects(reportOutline);
|
|
|
|
|
|
- // TODO: 2021/5/30 过滤出去年一月份之前创建的项目
|
|
|
- if (CollectionUtils.isEmpty(projectIds)) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- List<String> filteredProjectIds = new ArrayList<>();
|
|
|
+ List<String> comparableProjects = saasWebService.getComparableProjects(projectIds, reportMonth);
|
|
|
|
|
|
- return getPowerInfoByProjectIds(groupIdList, functionIdList, reportMonth, filteredProjectIds);
|
|
|
+ return getPowerInfoByProjectIds(groupIdList, functionIdList, reportMonth, comparableProjects);
|
|
|
}
|
|
|
|
|
|
/**
|