资产档案同步任务条件判断

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

@@ -73,34 +73,37 @@ public class SyncAssetsImpl implements SyncAssetsService {
                     //购入日期
                     if (ObjectUtil.isNotNull(formMap.get("dateField_lty0oyv9"))){
                         long buyTime = Long.parseLong(formMap.get("dateField_lty0oyv9").toString());
-                        if (metValue > 0 && depreciation > 0 && buyTime < toMonth){
-                            log.info("metValue:"+metValue);
-                            log.info("depreciation:"+depreciation);
-                            float updateDepreciation = (metValue - depreciation) >0 ? (metValue - depreciation) : 0;
-                            if (ObjectUtil.isNotEmpty(formMap.get("dateField_lty0oyva"))){
-                                //折旧截止日
-                                long endTime = Long.parseLong(formMap.get("dateField_lty0oyva").toString());
-                                String endDate = DateUtil.date(endTime).toString("yyyy-MM");
-                                long parseTime = DateUtil.beginOfMonth(DateUtil.parse(endDate, "yyyy-MM")).getTime();
-                                if (toMonth <= parseTime){
-                                    DateBetween dateBetween = new DateBetween(DateUtil.date(buyTime),DateUtil.date(toMonth));
-                                    count = dateBetween.betweenMonth(true) - 1;
-                                }
-                            }
+                        Map<String, Object> map = new HashMap<>();
+                        if (buyTime < toMonth){
                             DateBetween dateBetween = new DateBetween(DateUtil.date(buyTime),DateUtil.date(toMonth));
                             long months = dateBetween.betweenMonth(true) + 1;
-                            Map<String, Object> map = UtilMap.map("numberField_lu2ejqd4, numberField_lutjo2dt, numberField_m207nu7h", updateDepreciation, count, months);
                             if (ObjectUtil.isNotNull(formMap.get("textField_ltxyt75i")) && "同步成功".equals(formMap.get("textField_ltxyt75i"))) {
-                                map = UtilMap.map("numberField_m207nu7h",months);
+                                map.put("numberField_m207nu7h",months);
+                            }
+                            if (metValue > 0 && depreciation > 0){
+                                log.info("metValue:"+metValue);
+                                log.info("depreciation:"+depreciation);
+                                float updateDepreciation = (metValue - depreciation) >0 ? (metValue - depreciation) : 0;
+                                if (ObjectUtil.isNotEmpty(formMap.get("dateField_lty0oyva"))){
+                                    //折旧截止日
+                                    long endTime = Long.parseLong(formMap.get("dateField_lty0oyva").toString());
+                                    String endDate = DateUtil.date(endTime).toString("yyyy-MM");
+                                    long parseTime = DateUtil.beginOfMonth(DateUtil.parse(endDate, "yyyy-MM")).getTime();
+                                    if (toMonth <= parseTime){
+                                        dateBetween = new DateBetween(DateUtil.date(buyTime),DateUtil.date(toMonth));
+                                        count = dateBetween.betweenMonth(true) - 1;
+                                    }
+                                }
+                                map.put("numberField_lu2ejqd4",updateDepreciation);
+                                map.put("numberField_lutjo2dt",count);
                             }
-                            // 更新
+                        }
                         ydClient.operateData(YDParam.builder()
                                 .appType("APP_ERBDTFS82HOVBPL3NFH0")
                                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
                                 .formInstanceId((String) dataItem.get("formInstanceId"))
                                 .updateFormDataJson(JSON.toJSONString(map))
                                 .build(), YDConf.FORM_OPERATION.update);
-                        }
                     }
                 }
             });