From 58f78c39b458266c9af9e59bb49b4ce369b950f0 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 29 Jan 2024 12:22:53 +0300 Subject: [PATCH] =?UTF-8?q?reports-service=20=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=BA=D1=83?= =?UTF-8?q?=20ExecutionDeposit=20=D0=B8=20ExecutionFond?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reports/builders/ks/KSRepTradesReportBuilder.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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<>();