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

reports-service оправил выборку ExecutionDeposit и ExecutionFond

Browse source
This commit is contained in:
AKurakin 2024-01-29 12:22:53 +03:00
parent 2c3a08232b
commit 58f78c39b4
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,12 +84,18 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
ImdgPredicateBuilder pbExecutionDeposit = executionDepositImdg.predicateBuilder(); ImdgPredicateBuilder pbExecutionDeposit = executionDepositImdg.predicateBuilder();
Collection<ExecutionDeposit> executionDeposits = executionDepositImdg.getCollectionObjectsByPredicate( Collection<ExecutionDeposit> 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); log.debug("Found {} ExecutionDeposit by tradingDate={}", executionDeposits.size(), nowDate);
ImdgPredicateBuilder pbExecutionFond = executionFondImdg.predicateBuilder(); ImdgPredicateBuilder pbExecutionFond = executionFondImdg.predicateBuilder();
Collection<ExecutionFond> executionFonds = executionFondImdg.getCollectionObjectsByPredicate( Collection<ExecutionFond> 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); log.debug("Found {} ExecutionFond by tradingDate={}", executionFonds.size(), nowDate);
List<ExecutionCommon> executions = new ArrayList<>(); List<ExecutionCommon> executions = new ArrayList<>();