diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java index c81a43035..5c432cf0f 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java @@ -84,12 +84,18 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder executionDeposits = executionDepositImdg.getCollectionObjectsByPredicate( - pbExecutionDeposit.equals("tradingDate", nowDate) + pbExecutionDeposit.or( + pbExecutionDeposit.equals("tradingDate", nowDate), + pbExecutionDeposit.greatEqual("firstLegSettlementDate", nowDate) + ) ); log.debug("Found {} ExecutionDeposit by tradingDate={}", executionDeposits.size(), nowDate); ImdgPredicateBuilder pbExecutionFond = executionFondImdg.predicateBuilder(); Collection executionFonds = executionFondImdg.getCollectionObjectsByPredicate( - pbExecutionFond.equals("tradingDate", nowDate) + pbExecutionFond.or( + pbExecutionFond.equals("tradingDate", nowDate), + pbExecutionFond.greatEqual("settlementDate", nowDate) + ) ); log.debug("Found {} ExecutionFond by tradingDate={}", executionFonds.size(), nowDate); List executions = new ArrayList<>();