Skip to content

A
amos-boot-biz
Commit 2ba1857f authored by tangwei's avatar tangwei
Browse files
Options

电站小数保留3位小数

parent 31432033
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 23 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 2ba1857f
...@@ -510,7 +510,7 @@ ...@@ -510,7 +510,7 @@
`cumulative_income` cumulativeIncome, `cumulative_income` cumulativeIncome,
`email`, `email`,
rated_power ratedPower, rated_power ratedPower,
ROUND(`day_generate`/rated_power,3) fullhour, ROUND(`day_generate`/capacity,3) fullhour,
(select privilege_company.COMPANY_NAME from privilege_company where privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code) regionalCompaniesName (select privilege_company.COMPANY_NAME from privilege_company where privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code) regionalCompaniesName
from hygf_jp_station from hygf_jp_station
<where> <where>
......
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 @ 2ba1857f
...@@ -455,9 +455,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -455,9 +455,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setState(jpStation.getState()); hd.setState(jpStation.getState());
hd.setThirdStationId(jpStation.getThirdStationId()); hd.setThirdStationId(jpStation.getThirdStationId());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower():null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower())):null);
hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()*FD/jpStation.getCapacity()))); hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()*FD/jpStation.getCapacity())));
hd.setCumulativeIncome(jpStation.getCumulativeIncome()); hd.setCumulativeIncome(jpStation.getCumulativeIncome()!=null?Double.valueOf(String.format("%.3f",jpStation.getCumulativeIncome())):null);
ld.add(hd); ld.add(hd);
} }
...@@ -475,9 +475,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -475,9 +475,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setState(jpStation.getState()); hd.setState(jpStation.getState());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower()*FDL)):null);
hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()/jpStation.getCapacity()))); hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()/jpStation.getCapacity())));
hd.setCumulativeIncome(jpStation.getCumulativeIncome());
hd.setCumulativeIncome(jpStation.getCumulativeIncome()!=null?Double.valueOf(String.format("%.3f",jpStation.getCumulativeIncome())):null);
ld.add(hd); ld.add(hd);
} }
...@@ -495,12 +496,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -495,12 +496,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setState(jpStation.getState()); hd.setState(jpStation.getState());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower()*FDL)):null);
hd.setThirdStationId(jpStation.getThirdStationId()); hd.setThirdStationId(jpStation.getThirdStationId());
hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null); hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
hd.setDayGenerate(dayGenerate.getGenerate()); hd.setDayGenerate(dayGenerate.getGenerate()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getGenerate())):null);
hd.setTimeDate(dayGenerate.getDayTime()); hd.setTimeDate(dayGenerate.getDayTime());
hd.setDayIncome(dayGenerate.getIncome()); hd.setDayIncome(dayGenerate.getIncome()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getIncome())):null);
break; break;
} }
} }
...@@ -521,9 +522,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -521,9 +522,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setState(jpStation.getState()); hd.setState(jpStation.getState());
hd.setThirdStationId(jpStation.getThirdStationId()); hd.setThirdStationId(jpStation.getThirdStationId());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower()*FDL)):null);
hd.setMonthGenerate(dayGenerate.getGenerate()); hd.setMonthGenerate(dayGenerate.getGenerate()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getGenerate())):null);
hd.setMonthIncome(dayGenerate.getIncome()); hd.setMonthIncome(dayGenerate.getIncome()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getIncome())):null);
hd.setTimeDate(dayGenerate.getMonthTime()); hd.setTimeDate(dayGenerate.getMonthTime());
hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null); hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
break; break;
...@@ -545,12 +546,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -545,12 +546,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setState(jpStation.getState()); hd.setState(jpStation.getState());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower()*FDL)):null);
hd.setThirdStationId(jpStation.getThirdStationId()); hd.setThirdStationId(jpStation.getThirdStationId());
hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null); hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
hd.setYearGenerate(dayGenerate.getGenerate()); hd.setYearGenerate(dayGenerate.getGenerate()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getGenerate())):null);
hd.setYearIncome(dayGenerate.getIncome()); hd.setYearIncome(dayGenerate.getIncome()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getIncome())):null);
hd.setTimeDate(dayGenerate.getYearTime()); hd.setTimeDate(dayGenerate.getYearTime());
break; break;
} }
...@@ -638,12 +639,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -638,12 +639,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setState(jpStation.getState()); hd.setState(jpStation.getState());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower()*FDL)):null);
hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null); hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
hd.setDayGenerate(dayGenerate.getGenerate()); hd.setDayGenerate(dayGenerate.getGenerate()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getGenerate())):null);
hd.setTimeDate(dayGenerate.getDayTime()); hd.setTimeDate(dayGenerate.getDayTime());
hd.setDayIncome(dayGenerate.getIncome()); hd.setDayIncome(dayGenerate.getIncome()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getIncome())):null);
break; break;
} }
} }
...@@ -662,9 +663,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -662,9 +663,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setName(jpStation.getName()); hd.setName(jpStation.getName());
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower()*FDL)):null);
hd.setMonthGenerate(dayGenerate.getGenerate()); hd.setMonthGenerate(dayGenerate.getGenerate()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getGenerate())):null);
hd.setMonthIncome(dayGenerate.getIncome()); hd.setMonthIncome(dayGenerate.getIncome()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getIncome())):null);
hd.setTimeDate(dayGenerate.getMonthTime()); hd.setTimeDate(dayGenerate.getMonthTime());
hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null); hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
break; break;
...@@ -685,11 +686,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -685,11 +686,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setName(jpStation.getName()); hd.setName(jpStation.getName());
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null); hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower()*FDL)):null);
hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null); hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
hd.setYearGenerate(dayGenerate.getGenerate()); hd.setYearGenerate(dayGenerate.getGenerate()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getGenerate())):null);
hd.setYearIncome(dayGenerate.getIncome()); hd.setYearIncome(dayGenerate.getIncome()!=null?Double.valueOf(String.format("%.3f",dayGenerate.getIncome())):null);
hd.setTimeDate(dayGenerate.getYearTime()); hd.setTimeDate(dayGenerate.getYearTime());
break; break;
} }
......
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