Skip to content

A
amos-boot-zx-biz
Commit 762516a1 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

修复电站监控报表导出和展示不一致

parent e2eca41b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 9 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ 762516a1
......@@ -596,7 +596,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoAlldto( List<JpStationDto> da){
List<JpStationDto> ld=new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
int index=0;
int index=1;
for (JpStationDto jpStation : da) {
JpStationDto hd=new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr());
......@@ -608,7 +608,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setState(jpStation.getState());
hd.setThirdStationId(jpStation.getThirdStationId());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower())):null);
hd.setFullhour(jpStation.getAccumulatedPower()!=null ? Double.valueOf(String.format("%.3f", jpStation.getAccumulatedPower()))*FD/jpStation.getCapacity():null);
if(jpStation.getCapacity()!=0){
hd.setFullhour(jpStation.getAccumulatedPower()!=null ? Double.valueOf(String.format("%.3f",Double.valueOf(String.format("%.3f", jpStation.getAccumulatedPower()))*FD/jpStation.getCapacity())):null);
}else {
hd.setFullhour(jpStation.getAccumulatedPower()!=null ? Double.valueOf(String.format("%.3f",Double.valueOf(String.format("%.3f", jpStation.getAccumulatedPower()))*FD)):null);
}
hd.setCumulativeIncome(jpStation.getCumulativeIncome()!=null?Double.valueOf(String.format("%.3f",jpStation.getCumulativeIncome())):null);
hd.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(jpStation.getRegionalCompaniesCode()));
......@@ -622,7 +626,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
List<JpStationDto> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
Integer index=0;
Integer index=1;
for (JpStation jpStation : da) {
JpStationDto hd = new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr());
......@@ -892,7 +896,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<DayGenerateEX> getJpStationDtodaynew( List<JpStation> da, List<DayGenerate> listday){
List<DayGenerateEX> ld=new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
int i=0;
int index=1;
for (DayGenerate dayGenerate : listday) {
DayGenerateEX hd = new DayGenerateEX();
for (JpStation jpStation : da) {
......@@ -903,7 +907,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
break;
}
}
hd.setIndex(i++);
hd.setIndex(index++);
hd.setName(dayGenerate.getStationName());
hd.setState(dayGenerate.getStationState());
hd.setFullhour(dayGenerate.getFullhour() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getFullhour())) : null);
......@@ -919,7 +923,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<MonthGenerateEX> getJpStationDtomonthnew(List<JpStation> da, List<MonthGenerate> listmonth) {
List<MonthGenerateEX> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
int i=0;
int index=1;
for (MonthGenerate dayGenerate : listmonth) {
MonthGenerateEX hd = new MonthGenerateEX();
for (JpStation jpStation : da) {
......@@ -930,7 +934,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
break;
}
}
hd.setIndex(i++);
hd.setIndex(index++);
hd.setName(dayGenerate.getStationName());
hd.setMonthGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setMonthIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
......@@ -945,7 +949,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<YearGenerateEX> getJpStationDtoyearnew(List<JpStation> da, List<YearGenerate> listyear) {
List<YearGenerateEX> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
int i=0;
int index=1;
for (YearGenerate dayGenerate : listyear) {
YearGenerateEX hd = new YearGenerateEX();
for (JpStation jpStation : da) {
......@@ -957,7 +961,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
break;
}
}
hd.setIndex(i++);
hd.setIndex(index++);
hd.setName(dayGenerate.getStationName());
hd.setFullhour(dayGenerate.getFullhour() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getFullhour())) : null);
hd.setYearGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
......
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