|
@@ -56,7 +56,7 @@ public class EnergyEfficiencyFactory {
|
|
|
String monthlyEnergyEfficiency = energyEfficiencyService.getMonthlyEnergyEfficiency(
|
|
|
energyEfficiencyDefine.getTargetCode(), projectId, reportMonth);
|
|
|
return new AttrValueVO(ProjectEnergyEfficiencyContentCodes.currentMonth.name(),
|
|
|
- monthlyEnergyEfficiency, AttrValueTypeEnum.number);
|
|
|
+ monthlyEnergyEfficiency, AttrValueTypeEnum.number_2);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -242,7 +242,7 @@ public class EnergyEfficiencyFactory {
|
|
|
}
|
|
|
// 将能效值降序排序
|
|
|
List<Double> efficiencyList = Lists.newArrayList(efficiencyDateListMap.keySet());
|
|
|
- Collections.reverse(efficiencyList);
|
|
|
+ efficiencyList = efficiencyList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
|
|
|
|
|
|
Double maxValue = efficiencyList.get(0);
|
|
|
List<String> maxDays = efficiencyDateListMap.get(maxValue);
|
|
@@ -269,7 +269,7 @@ public class EnergyEfficiencyFactory {
|
|
|
}
|
|
|
// 将能效值升序排序
|
|
|
List<Double> efficiencyList = Lists.newArrayList(efficiencyDateListMap.keySet());
|
|
|
- Collections.sort(efficiencyList);
|
|
|
+ efficiencyList = efficiencyList.stream().sorted().collect(Collectors.toList());
|
|
|
|
|
|
Double minValue = efficiencyList.get(0);
|
|
|
List<String> minDays = efficiencyDateListMap.get(minValue);
|