修改累计发电量单位

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

@@ -61,7 +61,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     YearGenerateMapper   yearGenerateMapper;
 
     private static double FDL=0.001;
-
+    private static int FD=1000;
     /**
      * 分页查询
      */
@@ -455,8 +455,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setThirdStationId(jpStation.getThirdStationId());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower());
-                    hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()*1000/jpStation.getRatedPower())));
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FD:null);
+                    hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()*FD/jpStation.getRatedPower())));
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
                     hd.setCumulativeIncome(jpStation.getCumulativeIncome());
                     ld.add(hd);