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

http://jira.mfd.msk:8088/browse/CLS-497 fix

Browse source
This commit is contained in:
akulikov 2023-09-28 16:53:58 +03:00
parent c66df265d9
commit 4b089a91ae
3 changed files with 9 additions and 13 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/reports/ks/KSRepCashNettoReportBuilder.java
View file

@ -67,13 +67,11 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TM_T, RegistryTradingParams.OM_T).build(); String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TM_T, RegistryTradingParams.OM_T).build();
List<Long> sessionIds = params.getSessionId();
if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg);
ImdgPredicate finalPredicate = pb.and( ImdgPredicate finalPredicate = pb.and(
pb.not(pb.in("registryStatus", pb.in("sessionId", sessionIds.toArray(new Long[0])),
RegistryStatus.CLRD.getKey(), pb.equals("clearingDate", nowDate),
RegistryStatus.UNCV.getKey(),
RegistryStatus.FAIL.getKey(),
RegistryStatus.NACK.getKey(),
RegistryStatus.NACC.getKey())),
pb.sql(sql), pb.sql(sql),
pb.or( pb.or(
pb.equals("accountType", AccountType.Clrn.getKey()), pb.equals("accountType", AccountType.Clrn.getKey()),

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

@ -66,14 +66,12 @@ public class KSRepDepoNettoReportBuilder extends CSVReportBuilder<SessionIdParam
LocalDate nowDate = LocalDate.now(); LocalDate nowDate = LocalDate.now();
ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
List<Long> sessionIds = params.getSessionId();
if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg);
String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TS_T, RegistryTradingParams.OS_T).build(); String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TS_T, RegistryTradingParams.OS_T).build();
ImdgPredicate finalPredicate = pb.and( ImdgPredicate finalPredicate = pb.and(
pb.not(pb.in("registryStatus", pb.in("sessionId", sessionIds.toArray(new Long[0])),
RegistryStatus.CLRD.getKey(), pb.equals("clearingDate", nowDate),
RegistryStatus.UNCV.getKey(),
RegistryStatus.FAIL.getKey(),
RegistryStatus.NACK.getKey(),
RegistryStatus.NACC.getKey())),
pb.sql(sql), pb.sql(sql),
pb.equals("accountType", AccountType.Depo.getKey()), pb.equals("accountType", AccountType.Depo.getKey()),
pb.notNull("account") pb.notNull("account")

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
View file

@ -142,7 +142,7 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
} }
KSRepDepoRegisterQuantitiesReport ksRepDepoRegisterQuantitiesReport = new KSRepDepoRegisterQuantitiesReport(); KSRepDepoRegisterQuantitiesReport ksRepDepoRegisterQuantitiesReport = new KSRepDepoRegisterQuantitiesReport();
ksRepDepoRegisterQuantitiesReport.setFirmId(String.valueOf(statement.getAddresseeId())); ksRepDepoRegisterQuantitiesReport.setFirmId(company.getTradingCode());
ksRepDepoRegisterQuantitiesReport.setAccount(statement.getAccount()); ksRepDepoRegisterQuantitiesReport.setAccount(statement.getAccount());
ksRepDepoRegisterQuantitiesReport.setTkr(registry.getTradingClearingRegistry()); ksRepDepoRegisterQuantitiesReport.setTkr(registry.getTradingClearingRegistry());
ksRepDepoRegisterQuantitiesReport.setSecurityId(security.getSecuritySymbol()); ksRepDepoRegisterQuantitiesReport.setSecurityId(security.getSecuritySymbol());