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

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

Browse source
This commit is contained in:
akulikov 2023-09-25 15:47:16 +03:00
parent db00bb906f
commit 80fcb32abe
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,21 +107,24 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
pbRegistry.equals("companyId", statement.getAddresseeId()),
pbRegistry.equals("account", statement.getAccount()),
pbRegistry.equals("accountType", AccountType.Depo.getKey()),
RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AS_T).buildPredicate(pbRegistry)
RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AS_T).buildPredicate(pbRegistry),
pbRegistry.equals("securityId", statement.getSecurityId())
)
);
if (registries.isEmpty()) {
log.warn(
"Can't find registry for companyId = {} and account: {}. Statement id = {} skipped",
"Can't find registry for companyId = {}, securityId = {} and account: {}. Statement id = {} skipped",
statement.getAddresseeId(),
statement.getSecurityId(),
statement.getAccount(),
statement.getId()
);
continue;
} else if (registries.size() > 1) {
log.warn(
"More then one AS_T registry found for companyId = {} and account: {}, statement id {}. Use first",
"More then one AS_T registry found for companyId = {}, securityId = {} and account: {}, statement id {}. Use first",
statement.getAddresseeId(),
statement.getSecurityId(),
statement.getAccount(),
statement.getId()
);

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

@ -293,6 +293,7 @@ public class ReportServiceTest_KS {
registry_1.setRegistryDesignation("A");
registry_1.setRegistryInstrumentType("S");
registry_1.setRegistryUnit("T");
registry_1.setSecurityId(777L);
registryImdg.insert(registry_1);