treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2024-10-18 16:05:00 +03:00
commit cf317b252b
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java
View file

@ -81,10 +81,7 @@ public class KSRepLccTradesReportBuilder extends CSVReportBuilder<EmptyParams, K
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
ImdgPredicateBuilder pb = executionCurrencyImdg.predicateBuilder(); ImdgPredicateBuilder pb = executionCurrencyImdg.predicateBuilder();
Collection<ExecutionCurrency> executions = executionCurrencyImdg.getCollectionObjectsByPredicate( Collection<ExecutionCurrency> executions = executionCurrencyImdg.getCollectionObjectsByPredicate(
pb.or( pb.equals("tradingDate", now)
pb.equals("tradingDate", now),
pb.equals("settlementDate", now)
)
); );
rows = new ArrayList<>(executions.size()); rows = new ArrayList<>(executions.size());

1
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
View file

@ -1396,6 +1396,7 @@ public class ReportServiceTest_KS {
ExecutionCurrency executionCurrency_2 = new ExecutionCurrency(); ExecutionCurrency executionCurrency_2 = new ExecutionCurrency();
executionCurrency_2.setSessionId(session_2.getId()); executionCurrency_2.setSessionId(session_2.getId());
executionCurrency_2.setTradingDate(LocalDate.now());
executionCurrency_2.setSettlementDate(LocalDate.now()); executionCurrency_2.setSettlementDate(LocalDate.now());
executionCurrency_2.setSessionId(SESSION_ID_2); executionCurrency_2.setSessionId(SESSION_ID_2);
executionCurrency_2.setExchangeExecutionId(123L); executionCurrency_2.setExchangeExecutionId(123L);