malijun 5 kuukautta sitten
vanhempi
commit
82c0e31efa

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

@@ -1871,39 +1871,39 @@ public class JavaFunctionJobHandler extends IJobHandler {
 
 
         for (ProEconReportIndicatorPool pool : list) {
-
             rfdl += pool.getRfdldb();
             swdl += pool.getRswdldb();
             gwdl += pool.getRgwgwdldb();
             zhcydl += pool.getRzhcydldb();
-            yfdl += pool.getYfdcydldb();
+            yfdl += pool.getYfdldb();
             yswdl += pool.getYswdldb();
             ygwdl += pool.getYgwgwdldb();
             yzhcydl += pool.getYzhcydldb();
-            nfdl += pool.getNfdcydldb();
+            nfdl += pool.getNfdldb();
             nswdl += pool.getNswdldb();
             ngwdl += pool.getNgwgwdldb();
             nzhcydl += pool.getNzhcydldb();
         }
 
-
+        QueryWrapper<ProEconReportIndicatorPool> wrapperrp2 = new QueryWrapper<>();
+        wrapperrp2.eq("record_date", time0).eq("foreign_key_id", "GJNY_SXGS_DBXNY_ZGS0");
+        ProEconReportIndicatorPool GSZB = reportIndicatorPoolService.getOne(wrapperrp2);
         //公司指标集合
-        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.setYfdldb(yfdl);
         GSZB.setYswdldb(yswdl);
         GSZB.setYgwgwdldb(ygwdl);
         GSZB.setYzhcydldb(yzhcydl);
-        GSZB.setNfdcydldb(nfdl);
+        GSZB.setNfdldb(nfdl);
         GSZB.setNswdldb(nswdl);
         GSZB.setNgwgwdldb(ngwdl);
         GSZB.setNzhcydldb(nzhcydl);
-        list1.add(GSZB);
-        reportIndicatorPoolService.saveOrUpdateBatch(list1);
+
+        reportIndicatorPoolService.saveOrUpdate(GSZB);
+
 
 
     }

+ 12 - 0
universal-computing-platform/src/main/java/com/ruoyi/ucp/service/impl/ProEconReportIndicatorPoolServiceImpl.java

@@ -39,4 +39,16 @@ public class ProEconReportIndicatorPoolServiceImpl extends ServiceImpl<ProEconRe
         return super.save(entity);
     }
 
+    //getone
+    @Override
+    public ProEconReportIndicatorPool getOne(Wrapper<ProEconReportIndicatorPool> queryWrapper) {
+        return super.getOne(queryWrapper);
+    }
+
+    //saveorupdate
+    @Override
+    public boolean saveOrUpdate(ProEconReportIndicatorPool entity) {
+        return super.saveOrUpdate(entity);
+    }
+
 }