项目立项和资产档案调整

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/SyncAssetsImpl.java

@@ -94,7 +94,7 @@ public class SyncAssetsImpl implements SyncAssetsService {
                                         count = dateBetween.betweenMonth(true) - 1;
                                     }
                                 }
-                                map.put("numberField_lu2ejqd4",updateDepreciation);
+//                                map.put("numberField_lu2ejqd4",updateDepreciation);
                                 map.put("numberField_lutjo2dt",count);
                             }
                         }

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/TimerServiceImpl.java

@@ -1518,8 +1518,13 @@ public class TimerServiceImpl implements TimerService {
                 .build());
 
         double wh = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrn2oy4q", 0.0).toString())).sum();
-        double rg = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrn2oy4p", 0.0).toString())).sum();
-        double gs = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_mbptx9g2", 0.0).toString())).sum();
+        double rg = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrpvi1wh", 0.0).toString())).sum();
+        double gs = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrpvi1wi", 0.0).toString())).sum();
+        double monthGS = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrpvi1wg", 0.0).toString())).sum();
+        //历史逻辑
+//        double wh = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrn2oy4q", 0.0).toString())).sum();
+//        double rg = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrn2oy4p", 0.0).toString())).sum();
+//        double gs = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_mbptx9g2", 0.0).toString())).sum();
         double amount = monthAmount == null ? 0f : Double.parseDouble(monthAmount);
         double whRate = 0f;
         double rgRate = 0f;
@@ -1527,12 +1532,19 @@ public class TimerServiceImpl implements TimerService {
             whRate = wh / amount * 100;
             rgRate = rg / amount * 100;
         }
-
+        rgRate = dataList.stream().mapToDouble(map -> Double.parseDouble(map.getOrDefault("numberField_lrpvi1wj", 0.0).toString())).average().getAsDouble();
+//        历史
+//        ydClient.operateData(YDParam.builder()
+//                .appType("APP_ERBDTFS82HOVBPL3NFH0")
+//                .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
+//                .formInstanceId(formInstId)
+//                .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m3dvrmfd, numberField_m3dvrmfe, numberField_m3dvrmff, numberField_m3dvrmfg, numberField_mbptx9g2", rg, wh, rgRate, whRate, gs)))
+//                .build(), YDConf.FORM_OPERATION.update);
         ydClient.operateData(YDParam.builder()
                 .appType("APP_ERBDTFS82HOVBPL3NFH0")
                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
                 .formInstanceId(formInstId)
-                .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m3dvrmfd, numberField_m3dvrmfe, numberField_m3dvrmff, numberField_m3dvrmfg, numberField_mbptx9g2", rg, wh, rgRate, whRate, gs)))
+                .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m3dvrmfe, numberField_m3dvrmfg, numberField_m3dvrmfd, numberField_m3dvrmff, numberField_mbptx9g1, numberField_mdnu3uv9", wh, whRate, rg, rgRate, gs, monthGS)))
                 .build(), YDConf.FORM_OPERATION.update);
     }