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

merge CLS-752

Browse source
This commit is contained in:
akulikov 2024-09-09 12:51:32 +03:00
commit 905c4a0fd5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,12 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
registryPredicate, registryPredicate,
pb.greatEqual("refundDate", nowDate), pb.greatEqual("refundDate", nowDate),
pb.lessEqual("valueDate", nowDate), pb.lessEqual("valueDate", nowDate),
pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey()) pb.or(
pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey()),
pb.and(
pb.equals("sessionType", SessionType.UNIT.getKey()),
pb.equals("section", Section.MKR.getKey()))
)
); );
Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate); Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate); log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate);