diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java index c8e03fe9e..7625691ea 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java @@ -81,10 +81,7 @@ public class KSRepLccTradesReportBuilder extends CSVReportBuilder executions = executionCurrencyImdg.getCollectionObjectsByPredicate( - pb.or( - pb.equals("tradingDate", now), - pb.equals("settlementDate", now) - ) + pb.equals("tradingDate", now) ); rows = new ArrayList<>(executions.size()); diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java index c1716db7f..3910e0984 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java @@ -1396,6 +1396,7 @@ public class ReportServiceTest_KS { ExecutionCurrency executionCurrency_2 = new ExecutionCurrency(); executionCurrency_2.setSessionId(session_2.getId()); + executionCurrency_2.setTradingDate(LocalDate.now()); executionCurrency_2.setSettlementDate(LocalDate.now()); executionCurrency_2.setSessionId(SESSION_ID_2); executionCurrency_2.setExchangeExecutionId(123L);