1

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

@@ -1660,19 +1660,19 @@ public class JavaFunctionJobHandler extends IJobHandler {
             projectId = pool.getProjectId();
             day = dayMap.get(projectId);
             pool.setRfdldb(day.getRfdl().doubleValue());
-            pool.setRswdldb(day.getSwdl().doubleValue());
-            pool.setRgwgwdldb(day.getGwdl().doubleValue());
-            pool.setRfdcydldb(day.getCydl().doubleValue());
+            pool.setRswdldb(day.getSwdl());
+            pool.setRgwgwdldb(day.getGwdl());
+            pool.setRfdcydldb(day.getCydl());
             month = monthMap.get(projectId);
             pool.setYfdldb(month.getRfdl().doubleValue());
-            pool.setYswdldb(month.getSwdl().doubleValue());
-            pool.setYgwgwdldb(month.getGwdl().doubleValue());
-            pool.setYfdcydldb(month.getCydl().doubleValue());
+            pool.setYswdldb(month.getSwdl());
+            pool.setYgwgwdldb(month.getGwdl());
+            pool.setYfdcydldb(month.getCydl());
             year = yearMap.get(projectId);
             pool.setNfdldb(year.getRfdl().doubleValue());
-            pool.setNswdldb(year.getSwdl().doubleValue());
-            pool.setNgwgwdldb(year.getGwdl().doubleValue());
-            pool.setNfdcydldb(year.getCydl().doubleValue());
+            pool.setNswdldb(year.getSwdl());
+            pool.setNgwgwdldb(year.getGwdl());
+            pool.setNfdcydldb(year.getCydl());
             poolList.add(pool);
         }
         reportIndicatorPoolService.saveOrUpdateBatch(poolList);

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

@@ -1,5 +1,6 @@
 package com.ruoyi;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -107,5 +108,22 @@ public class Test {
 
 
     }
+
+
+    @org.junit.Test
+    public void test1() {
+        Date date = DateUtil.date().toJdkDate();
+        javaFunctionJobHandler.writeReportPool(date);
+        javaFunctionJobHandler.writeReportPoolProject(date);
+        javaFunctionJobHandler. writeReportPoolPjfs(date);
+
+    }
+
+
+
+
+
+
+
 }
 

universal-computing-platform/src/main/java/com/ruoyi/ucp/entity/LineInfoDay.java

@@ -34,9 +34,8 @@ public class LineInfoDay implements Serializable {
     private Date recordDate;
 
     private Integer  rfdl;
-    private Integer  swdl;
-    private Integer  gwdl;
-    private Integer  cydl;
-    private double  hjwd;
+    private double  swdl;
+    private double  gwdl;
+    private double  cydl;
 
 }