公司指标,理论发电量

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

@@ -1966,19 +1966,19 @@ public class JavaFunctionJobHandler extends IJobHandler {
             for (ProEconReportIndicatorPool pool : pools) {
                 projectId = pool.getForeignKeyId();
                 day = dayMap.get(projectId);
-                pool.setRllfdl(day.getPjfs());
+                pool.setRllfdl(day.getLlfdl());
                 month = monthMap.get(projectId);
-                pool.setYllfdl(month.getPjfs());
+                pool.setYllfdl(month.getLlfdl());
                 year = yearMap.get(projectId);
-                pool.setNllfdl(year.getPjfs());
+                pool.setNllfdl(year.getLlfdl());
             }
             double v1 = pools.stream().mapToDouble(ProEconReportIndicatorPool::getRllfdl).average().orElse(0);
             double v2 = pools.stream().mapToDouble(ProEconReportIndicatorPool::getYllfdl).average().orElse(0);
             double v3 = pools.stream().mapToDouble(ProEconReportIndicatorPool::getNllfdl).average().orElse(0);
             if (pools2 != null) {
-                pools2.setRpjfs(v1);
-                pools2.setYpjfs(v2);
-                pools2.setNpjfs(v3);
+                pools2.setRllfdl(v1);
+                pools2.setYllfdl(v2);
+                pools2.setNllfdl(v3);
                 reportIndicatorPoolService.saveOrUpdate(pools2);
             }
             reportIndicatorPoolService.saveOrUpdateBatch(pools);