Commit c4418565 authored by tangwei's avatar tangwei

修改发电小时

parent 5ba6c06d
...@@ -881,7 +881,8 @@ public class MonitoringServiceImpl { ...@@ -881,7 +881,8 @@ public class MonitoringServiceImpl {
//填写发电小时数 //填写发电小时数
String finalIndicator = indicator; String finalIndicator = indicator;
stationBasicListAll.forEach(stationBasic -> { stationBasicListAll.forEach(stationBasic -> {
Double install = getStationCaPACITYL(stationBasic.getStationNumber()); Double install1 = getStationCaPACITYL(stationBasic.getStationNumber());
BigDecimal gfInstall = new BigDecimal( String.format("%.2f", install1));
Double total = 0.00; Double total = 0.00;
List<Map<String, Object>> mapListData = new ArrayList<>(); List<Map<String, Object>> mapListData = new ArrayList<>();
if (!stationBasic.getStationType().equals("FDZ")) { if (!stationBasic.getStationType().equals("FDZ")) {
...@@ -906,7 +907,7 @@ public class MonitoringServiceImpl { ...@@ -906,7 +907,7 @@ public class MonitoringServiceImpl {
List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class); List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator); total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator);
} }
stationBasic.setAddress(String.format(CommonConstans.Twodecimalplaces, (total * 10) / install)); stationBasic.setAddress(String.format(CommonConstans.Twodecimalplaces, (total * 10) / gfInstall.doubleValue()));
if (stationBasic.getAddress().equals("NaN")) { if (stationBasic.getAddress().equals("NaN")) {
stationBasic.setAddress("0.00"); stationBasic.setAddress("0.00");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment