diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java index ff0d31ccf..f726283c2 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -98,7 +98,12 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia if (!csvMode) preClearMap.preClearMap(); List registryForReport = new ArrayList<>(); for (RegistryHistory registryHistory : registryHistories) { - if (BigDecimal.ZERO.compareTo(registryHistory.getObject().getDiffBalance()) != 0) continue; + AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registryHistory.getObject().getAccountType()); + if (accountType != AccountType.Info && + BigDecimal.ZERO.compareTo(registryHistory.getObject().getDiffBalance()) != 0) { + log.trace("Ignore id={}, cause diffBalance is not zero.", registryHistory.getObject().getId()); + continue; + } if (!csvMode) insertMoneyBalanceRegister(registryHistory); else registryForReport.add(registryHistory); } @@ -148,7 +153,7 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia ImdgPredicate finalPredicate = pb.and( registryPredicate, pb.notNull("object.tradingClearingRegistry"), - pb.equals("object.accountType", AccountType.Info.getKey()), + // фильтрация по "object.accountType"==Info or diffBalance==0.0 в коде выше по moneyBalanceRegisterNew pb.and( pb.greatEqual("eventTime", now), pb.less("eventTime", now.plus(1, ChronoUnit.DAYS))