代码优化

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

@@ -442,8 +442,8 @@ public class ComprehensiveelectricityService {
 
                     if (!zbls.isEmpty() && zbls != null) {
                         //综合场用电量取值
-//                        zhcydl = zbls.get(0).getZhcydl().doubleValue();
-//                        zhcydlsum += zhcydl;
+                        zhcydl = zbls.get(0).getZhcydl().doubleValue();
+                        zhcydlsum += zhcydl;
                         //发电量取值
                         if (calFirstMonth == currentMonth && currentyear == dqnf) {
                             //                        sjdl = (zbls.get(0).getYfdldb().doubleValue() / 10000) + (rfdlsj / 10000);
@@ -459,8 +459,8 @@ public class ComprehensiveelectricityService {
                         //购网电量取值
                         gwdl = zbls.get(0).getGwdl().doubleValue();
                         gwdlsum += gwdl;
-                        zhcydl = sjdl - swdl + gwdl ;
-                        zhcydlsum += zhcydl;
+//                        zhcydl = sjdl - swdl + gwdl ;
+//                        zhcydlsum += zhcydl;
 
                         //综合场用电率计算 —— 综合场用电率=(发电量-上网电量+购网电量)/发电量
                         if (sjdl != 0) {