公司指标

ruoyi-admin/src/test/java/com/ruoyi/JavaFunctionJobHandler.java

@@ -1841,19 +1841,78 @@ public class JavaFunctionJobHandler extends IJobHandler {
         List<ProEconReportIndicatorPool> list = reportIndicatorPoolService.list(wrapper);
         //遍历list,累加指标RFDL
 
-        //公司指标
+        //公司指标,日发电量
         double rfdl = 0;
+        //公司指标,日上网电量
+        double swdl = 0;
+        //公司指标,日购网电量
+        double gwdl = 0;
+        //公司指标,日综合厂用电量
+        double zhcydl = 0;
+
+        //公司指标,月发电量
+        double yfdl = 0;
+        //公司指标,月上网电量
+        double yswdl = 0;
+        //公司指标,月购网电量
+        double ygwdl = 0;
+        //公司指标,月综合厂用电量
+        double yzhcydl = 0;
+
+        //公司指标,年发电量
+        double nfdl = 0;
+        //公司指标,年上网电量
+        double nswdl = 0;
+        //公司指标,年购网电量
+        double ngwdl = 0;
+        //公司指标,年综合厂用电量
+        double nzhcydl = 0;
+
+
+
         for (ProEconReportIndicatorPool pool : list) {
 
             rfdl += pool.getRfdldb();
+            swdl += pool.getRswdldb();
+            gwdl += pool.getRgwgwdldb();
+            zhcydl += pool.getRzhcydldb();
+            yfdl += pool.getYfdcydldb();
+            yswdl += pool.getYswdldb();
+            ygwdl += pool.getYgwgwdldb();
+            yzhcydl += pool.getYzhcydldb();
+            nfdl += pool.getNfdcydldb();
+            nswdl += pool.getNswdldb();
+            ngwdl += pool.getNgwgwdldb();
+            nzhcydl += pool.getNzhcydldb();
         }
+
+
+        //公司指标集合
+        ArrayList<ProEconReportIndicatorPool> list1 = new ArrayList<>();
+        ProEconReportIndicatorPool GSZB = new ProEconReportIndicatorPool();
+        GSZB.setRfdldb(rfdl);
+        GSZB.setRswdldb(swdl);
+        GSZB.setRgwgwdldb(gwdl);
+        GSZB.setRzhcydldb(zhcydl);
+        GSZB.setYfdcydldb(yfdl);
+        GSZB.setYswdldb(yswdl);
+        GSZB.setYgwgwdldb(ygwdl);
+        GSZB.setYzhcydldb(yzhcydl);
+        GSZB.setNfdcydldb(nfdl);
+        GSZB.setNswdldb(nswdl);
+        GSZB.setNgwgwdldb(ngwdl);
+        GSZB.setNzhcydldb(nzhcydl);
+        list1.add(GSZB);
+        reportIndicatorPoolService.saveOrUpdateBatch(list1);
+
+
     }
 
 
 }
 
 
-}
+