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

Execution условие на маркет

Browse source
This commit is contained in:
ialbert 2025-06-23 15:33:04 +03:00
parent f21bafb2d7
commit bacea62e45
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,14 +144,14 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
// Есть 2 пары Execution, SELL и BUY, статус определяем заранее по SELL и проставляем в BUY // Есть 2 пары Execution, SELL и BUY, статус определяем заранее по SELL и проставляем в BUY
if (coverage == CoverageStatus.DEND) { if (coverage == CoverageStatus.DEND) {
if (execution instanceof ExecutionFond) { if (execution instanceof ExecutionFond) {
ImdgPredicateBuilder pbRegistry = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
ImdgPredicate registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams._S_T).buildPredicate(pbRegistry); ImdgPredicate registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams._S_T).buildPredicate(pb);
Collection<Registry> registryCollection = registryImdg.getCollectionObjectsByPredicate( Collection<Registry> registryCollection = registryImdg.getCollectionObjectsByPredicate(
pbRegistry.and( pb.and(
pbRegistry.equals("groupId", groupId), pb.equals("groupId", groupId),
pbRegistry.equals("market", execution.getMarket()), //fixme может быть "старый" registry без market pb.or(pb.equals("market", execution.getMarket()), pb.isNull("market")),
pbRegistry.equals("companyId", execution.getCompanyId()), pb.equals("companyId", execution.getCompanyId()),
pbRegistry.in("registryStatus", pb.in("registryStatus",
RegistryStatus.NACC.getKey(), RegistryStatus.NACC.getKey(),
RegistryStatus.NACK.getKey(), RegistryStatus.NACK.getKey(),
RegistryStatus.FAIL.getKey(), RegistryStatus.FAIL.getKey(),