Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DayGenerate.java

@@ -46,4 +46,9 @@ public class DayGenerate {
     @TableField("fullhour")
     private Double fullhour;
 
+
+    @TableField("income")
+    // 日收益
+    private Double dayIncome;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthGenerate.java

@@ -47,4 +47,10 @@ public class MonthGenerate {
      * */
     @TableField("fullhour")
     private Double fullhour;
+
+
+
+    // 月收益
+    @TableField("income")
+    private Double monthIncome;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearGenerate.java

@@ -46,4 +46,9 @@ public class YearGenerate {
      * */
     @TableField("fullhour")
     private Double fullhour;
+
+
+    // 年收益
+    @TableField("income")
+    private Double yearIncome;
 }

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

@@ -463,7 +463,6 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             hd.setAccumulatedPower(jpStation.getAccumulatedPower());
             hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()/jpStation.getCapacity())));
             hd.setAccumulatedPower(jpStation.getAccumulatedPower());
-            hd.setDayIncome(null);
             ld.add(hd);
         }
 
@@ -486,7 +485,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setFullhour(dayGenerate.getFullhour());
                     hd.setDayGenerate(dayGenerate.getGenerate());
                     hd.setTimeDate(dayGenerate.getDayTime());
-                    hd.setDayIncome(null);
+                    hd.setDayIncome(dayGenerate.getDayIncome());
                     break;
                 }
             }
@@ -507,11 +506,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
-
-                    hd.setMonthIncome(dayGenerate.getGenerate());
+                    hd.setMonthGenerate(dayGenerate.getGenerate());
+                    hd.setMonthIncome(dayGenerate.getMonthIncome());
                     hd.setTimeDate(dayGenerate.getMonthTime());
                     hd.setFullhour(dayGenerate.getFullhour());
-                    hd.setMonthGenerate(null);
                     break;
                 }
             }
@@ -535,7 +533,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
                     hd.setFullhour(dayGenerate.getFullhour());
                     hd.setYearGenerate(dayGenerate.getGenerate());
-                    hd.setYearIncome(null);
+                    hd.setYearIncome(dayGenerate.getYearIncome());
                     hd.setTimeDate(dayGenerate.getYearTime());
                     break;
                 }