发电量分析修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/CoulometricVo.java

@@ -12,25 +12,26 @@ public class CoulometricVo {
      */
     private Double sjdl;
 
+
     /**
-     * 可研电量
+     * 计划电量
      */
-    private Double kydl;
+    private Double jhdl;
 
     /**
-     * 可研完成情况
+     * 完成情况
      */
-    private Double kywcqk;
+    private Double wcqk;
 
     /**
-     * 计划电量
+     * 可研电量
      */
-    private Double jhdl;
+    private Double kydl;
 
     /**
-     * 完成情况
+     * 可研完成情况
      */
-    private Double wcqk;
+    private Double kywcqk;
 
     /**
      * 小时

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Comprehensive/PVSystemEfficiencyCalculator.java

@@ -448,14 +448,14 @@ public class PVSystemEfficiencyCalculator {
                 efficiencyEquipmentService.batchAdd(stringList);
             }
 
-
-            firstDayZeroHour4 = DateUtils.addMonths(firstDayZeroHour4, 1);
-            calFirstDayZeroHour4.setTime(firstDayZeroHour4);
-            calFirstMonth4 = calFirstDayZeroHour4.get(Calendar.MONTH) + 1;
+//
+//            firstDayZeroHour4 = DateUtils.addMonths(firstDayZeroHour4, 1);
+//            calFirstDayZeroHour4.setTime(firstDayZeroHour4);
+//            calFirstMonth4 = calFirstDayZeroHour4.get(Calendar.MONTH) + 1;
             ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
 //        }
             // 恢复初始值
-            firstDayZeroHour4 = initialFirstDayZeroHour4;
+//            firstDayZeroHour4 = initialFirstDayZeroHour4;
         }
 
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Electricity/Electricityservice.java

@@ -486,8 +486,8 @@ public class Electricityservice {
             bnrzqdhjsum += rzqddlls.get(0).getNpjfs().doubleValue();
         }
 
-        map.put("jhdlhj",yeardlsum);
-        map.put("kydlhj",kyyeardlsum);
+        map.put("jhdlhj",StringUtils.round(yeardlsum,2));
+        map.put("kydlhj",StringUtils.round(kyyeardlsum,2));
         map.put("sjdlhj",StringUtils.round(((bnsjdlhjsum / 10000)) + (rfdlsjhj / 10000),2));
         if (yeardlsum != 0) {
             map.put("wcqkhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));