|
@@ -106,9 +106,7 @@ public class BusinessReportPowerInfoServiceImpl implements com.persagy.apm.energ
|
|
|
|
|
|
for (String functionId : functionIdList) {
|
|
|
Function function = functionService.queryFunctionDetail(functionId);
|
|
|
- // TODO: 2021/5/31 解除注释
|
|
|
-// String itemName = functionService.getItemName(function, projectIds.get(0));
|
|
|
- String itemName = "test";
|
|
|
+ String itemName = functionService.getItemName(function, projectIds.get(0));
|
|
|
|
|
|
List<PowerItemVO> projectPowerItems = getPowerItemsByProjects(reportMonth, projectIds, function);
|
|
|
PowerItemVO powerSumByProjects = getPowerSum(projectPowerItems);
|
|
@@ -134,14 +132,13 @@ public class BusinessReportPowerInfoServiceImpl implements com.persagy.apm.energ
|
|
|
if (reportProjectInfo == null) {
|
|
|
continue;
|
|
|
}
|
|
|
- // TODO: 2021/5/31 解除注释
|
|
|
-// Map<String, TreeMap<Date, Double>> itemEnergyDataMap = getItemEnergyDataMap(
|
|
|
-// reportMonth, function.getItemId(), function.getModelCode(), reportProjectInfo.getProjectLocalID());
|
|
|
-// TreeMap<Date, Double> dateValueMap = itemEnergyDataMap.get(function.getItemId());
|
|
|
-// if (dateValueMap != null) {
|
|
|
-// PowerItemVO powerItemInfo = getPowerItemInfo(reportMonth, totalCommercialArea, dateValueMap);
|
|
|
-// projectPowerItems.add(powerItemInfo);
|
|
|
-// }
|
|
|
+ Map<String, TreeMap<Date, Double>> itemEnergyDataMap = getItemEnergyDataMap(
|
|
|
+ reportMonth, function.getItemId(), function.getModelCode(), reportProjectInfo.getProjectLocalID());
|
|
|
+ TreeMap<Date, Double> dateValueMap = itemEnergyDataMap.get(function.getItemId());
|
|
|
+ if (dateValueMap != null) {
|
|
|
+ PowerItemVO powerItemInfo = getPowerItemInfo(reportMonth, totalCommercialArea, dateValueMap);
|
|
|
+ projectPowerItems.add(powerItemInfo);
|
|
|
+ }
|
|
|
}
|
|
|
return projectPowerItems;
|
|
|
}
|