修改电站日发小时数，小数点位

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -187,10 +187,10 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
-            <if test="dto.regionalCompaniesCode!=null">
+            <if test="dto.regionalCompaniesCode!=null and dto.regionalCompaniesCode!=''">
                 and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
             </if>
-            <if test="dto.amosCompanyCode!=null">
+            <if test="dto.amosCompanyCode!=null and dto.amosCompanyCode!=''">
                 and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
             </if>
             <if test="dto.state!=null">

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

@@ -487,7 +487,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
 
-                    hd.setFullhour(dayGenerate.getFullhour());
+                    hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setDayGenerate(dayGenerate.getGenerate());
                     hd.setTimeDate(dayGenerate.getDayTime());
                     hd.setDayIncome(dayGenerate.getDayIncome());
@@ -514,7 +514,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setMonthGenerate(dayGenerate.getGenerate());
                     hd.setMonthIncome(dayGenerate.getMonthIncome());
                     hd.setTimeDate(dayGenerate.getMonthTime());
-                    hd.setFullhour(dayGenerate.getFullhour());
+                    hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     break;
                 }
             }
@@ -536,7 +536,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
 
-                    hd.setFullhour(dayGenerate.getFullhour());
+                    hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setYearGenerate(dayGenerate.getGenerate());
                     hd.setYearIncome(dayGenerate.getYearIncome());
                     hd.setTimeDate(dayGenerate.getYearTime());
@@ -627,7 +627,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
 
-                    hd.setFullhour(dayGenerate.getFullhour());
+                    hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setDayGenerate(dayGenerate.getGenerate());
                     hd.setTimeDate(dayGenerate.getDayTime());
                     hd.setDayIncome(dayGenerate.getDayIncome());
@@ -653,7 +653,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setMonthGenerate(dayGenerate.getGenerate());
                     hd.setMonthIncome(dayGenerate.getMonthIncome());
                     hd.setTimeDate(dayGenerate.getMonthTime());
-                    hd.setFullhour(dayGenerate.getFullhour());
+                    hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     break;
                 }
             }
@@ -674,7 +674,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
 
-                    hd.setFullhour(dayGenerate.getFullhour());
+                    hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setYearGenerate(dayGenerate.getGenerate());
                     hd.setYearIncome(dayGenerate.getYearIncome());
                     hd.setTimeDate(dayGenerate.getYearTime());