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 31f8eadd7..efc4f1e79 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 @@ -9,7 +9,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import java.time.LocalDate; import java.util.Collection; -import java.util.List; @Component public class ExecutedDealReportBuilder_INFTYPE_1 extends ExecutedDealReportBuilderCommon { @@ -31,11 +30,9 @@ public class ExecutedDealReportBuilder_INFTYPE_1 extends ExecutedDealReportBuild @Override protected Collection getExecutionFondsForReport(SessionIdParam params) { ImdgPredicateBuilder pb = executionFondImdg.predicateBuilder(); - List sessionIds = params.getSessionId(); - if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg); return executionFondImdg.getCollectionObjectsByPredicate( pb.and( - pb.in("sessionId", sessionIds.toArray(new Long[0])), + pb.notNull("sessionId"), pb.less("tradingDate", LocalDate.now()), pb.equals("settlementDate", LocalDate.now()) ) 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 04a0a7b4b..7b4917075 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 @@ -9,7 +9,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import java.time.LocalDate; import java.util.Collection; -import java.util.List; @Component public class ExecutedDealReportBuilder_INFTYPE_2 extends ExecutedDealReportBuilderCommon { @@ -31,11 +30,9 @@ public class ExecutedDealReportBuilder_INFTYPE_2 extends ExecutedDealReportBuild @Override protected Collection getExecutionFondsForReport(SessionIdParam params) { ImdgPredicateBuilder pb = executionFondImdg.predicateBuilder(); - List sessionIds = params.getSessionId(); - if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg); return executionFondImdg.getCollectionObjectsByPredicate( pb.and( - pb.in("sessionId",sessionIds.toArray(new Long[0])), + pb.notNull("sessionId"), pb.equals("tradingDate", LocalDate.now()), pb.equals("settlementDate", LocalDate.now()) ) 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 ff8937942..7c5fa19f3 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,10 +66,8 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder sessionIds = params.getSessionId(); - if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg); ImdgPredicate predicate = pb.and( - pb.in("sessionId", sessionIds.toArray(new Long[0])), + pb.notNull("sessionId"), pb.equals("coverageStatus", Allowed.DENIED.getKey()) ); Collection executionFonds = executionFondImdg.getCollectionObjectsByPredicate(predicate);