修改bug

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

@@ -472,7 +472,7 @@
         `rec_user_id` recUserId,
         `rec_user_name` recUserName,
         `sn_code` snCode,
-        `capacity` capacity,
+        ROUND(`capacity`,3) capacity,
         `name` ,
         `code` ,
         `system_code` systemCode,
@@ -501,8 +501,8 @@
         `organizational_code` organizationalCode,
         `is_delete` isDelete,
         ROUND(`day_generate`,3) dayGenerate,
-        `month_generate` monthGenerate,
-        `year_generate` yearGenerate,
+        ROUND(`month_generate`,3) monthGenerate,
+        ROUND(`year_generate`,3)  yearGenerate,
         `day_income` dayIncome,
         `month_income` monthIncome,
         `year_income` yearIncome,
@@ -510,7 +510,7 @@
         `cumulative_income` cumulativeIncome,
         `email`,
         rated_power ratedPower,
-        ROUND(`real_time_power`/rated_power,3) fullhour,
+        ROUND(`day_generate`/rated_power,3) fullhour,
         (select privilege_company.COMPANY_NAME  from   privilege_company where privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code)           regionalCompaniesName
         from hygf_jp_station
         <where>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -457,7 +457,7 @@ public class JpStationController extends BaseController {
         JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
         List<Map<String,Object>> powerRatio=new ArrayList<>();
         Map<String,Object> map=new HashMap<>();
-        map.put("value",String.format("%.2f",jpStation.getRealTimePower()/jpStation.getRatedPower()));
+        map.put("value",String.format("%.4f",jpStation.getRealTimePower()/jpStation.getRatedPower()));
         powerRatio.add(map);
         jpStation.setPowerRatio(powerRatio);
         List<JpStationDto> list=new ArrayList<>();
@@ -531,7 +531,7 @@ public class JpStationController extends BaseController {
 
 
         Map<String,Object> map2=new HashMap<>();
-        map2.put("name1","当日电量(kWh)");
+        map2.put("name1","当日电量(MWh)");
         map2.put("name2","当日收益(元)");
         //炭
         map2.put("value1",format2.format(jpStation.getDayGenerate()));