From d2cf49b7c8c033553ef955077b36ad436ef92561 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 2 Oct 2023 17:09:48 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497 --- .../reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java | 8 +++++++- .../reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java | 8 +++++++- .../reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java | 6 +++++- .../reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java | 6 +++++- .../reports/reports/bp/UnfulfilledDealReportBuilder.java | 6 +++++- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java index 272ac42ae..e1b45f4e9 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java @@ -3,6 +3,8 @@ package ru.spcex.clearing.reports.reports.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.spcex.clearing.reports.reports.SessionIdParam; +import ru.spcex.platform.enumeration.CoverageStatus; +import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.Side; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -36,7 +38,11 @@ public class ExecutedDealReportBuilder_INFTYPE_1 extends ExecutedDealReportBuild pb.notNull("sessionId"), pb.less("tradingDate", LocalDate.now()), pb.equals("settlementDate", LocalDate.now()), - pb.equals("side", Side.SELL.getKey()) + pb.or( + pb.equals("side", Side.SELL.getKey()), + pb.equals("side", MoneyFlowSide.SELL.getKey()) + ), + pb.equals("coverageStatus", CoverageStatus.ALWD) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java index ca795e318..f75818369 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java @@ -3,6 +3,8 @@ package ru.spcex.clearing.reports.reports.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.spcex.clearing.reports.reports.SessionIdParam; +import ru.spcex.platform.enumeration.CoverageStatus; +import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.Side; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -36,7 +38,11 @@ public class ExecutedDealReportBuilder_INFTYPE_2 extends ExecutedDealReportBuild pb.notNull("sessionId"), pb.equals("tradingDate", LocalDate.now()), pb.equals("settlementDate", LocalDate.now()), - pb.equals("side", Side.SELL.getKey()) + pb.or( + pb.equals("side", Side.SELL.getKey()), + pb.equals("side", MoneyFlowSide.SELL.getKey()) + ), + pb.equals("coverageStatus", CoverageStatus.ALWD) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java index ba5bfb406..0aaa6b7cd 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java @@ -3,6 +3,7 @@ package ru.spcex.clearing.reports.reports.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.spcex.clearing.reports.reports.SessionIdParam; +import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.Side; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -34,7 +35,10 @@ public class ExecutedDealReportBuilder_INFTYPE_3 extends ExecutedDealReportBuild return executionFondImdg.getCollectionObjectsByPredicate( pb.and( pb.greater("settlementDate", LocalDate.now()), - pb.equals("side", Side.SELL.getKey()) + pb.or( + pb.equals("side", Side.SELL.getKey()), + pb.equals("side", MoneyFlowSide.SELL.getKey()) + ) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java index c353ec60d..ca00f76b1 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java @@ -4,6 +4,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.platform.enumeration.Allowed; +import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.Side; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -36,7 +37,10 @@ public class ExecutedDealReportBuilder_INFTYPE_4 extends ExecutedDealReportBuild pb.and( pb.equals("coverageStatus", Allowed.DENIED.getKey()), pb.equals("settlementDate", LocalDate.now()), - pb.equals("side", Side.SELL.getKey()) + pb.or( + pb.equals("side", Side.SELL.getKey()), + pb.equals("side", MoneyFlowSide.SELL.getKey()) + ) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java index def911739..0e3ac7758 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java @@ -66,9 +66,13 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder executionFonds = executionFondImdg.getCollectionObjectsByPredicate(predicate); + log.debug("Found {} ExecutionFond by query: {}", executionFonds.size(), predicate); rows = new ArrayList<>(executionFonds.size()); for (ExecutionFond executionFond : executionFonds) {