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

fix KSRepLccValueReport

Browse source
This commit is contained in:
akulikov 2024-12-18 14:20:19 +03:00
parent cf24c196bc
commit 7c57fd8676
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,7 +192,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
String securitySymbol = registry.getSecuritySymbol(); String securitySymbol = registry.getSecuritySymbol();
RegistryStatus status = IEnumKey.getEnumByKey(RegistryStatus.class, registry.getRegistryStatus()); RegistryStatus status = IEnumKey.getEnumByKey(RegistryStatus.class, registry.getRegistryStatus());
Rates currencyRate = getRate(securitySymbol, currencyRates); Rates currencyRate = getRate(securitySymbol, currencyRates, reportDate.toLocalDate());
rates.computeIfAbsent(currencyRate.getCurrencyId(), c -> currencyRate.getValue()); rates.computeIfAbsent(currencyRate.getCurrencyId(), c -> currencyRate.getValue());
String currency = currencies.computeIfAbsent(currencyRate.getCurrencyId(), s -> registry.getSecuritySymbol()); String currency = currencies.computeIfAbsent(currencyRate.getCurrencyId(), s -> registry.getSecuritySymbol());
@ -373,7 +373,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
} }
private Rates getRate(String securitySymbol, Map<String, Rates> currencyRates) { private Rates getRate(String securitySymbol, Map<String, Rates> currencyRates, LocalDate reportDate) {
Rates currencyRate = currencyRates.get(securitySymbol); Rates currencyRate = currencyRates.get(securitySymbol);
if (currencyRate == null) { if (currencyRate == null) {
ImdgPredicateBuilder ratesPB = ratesImdg.predicateBuilder(); ImdgPredicateBuilder ratesPB = ratesImdg.predicateBuilder();
@ -381,7 +381,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
ratesPB.and( ratesPB.and(
ratesPB.equals("currency", securitySymbol), ratesPB.equals("currency", securitySymbol),
ratesPB.notNull("value"), ratesPB.notNull("value"),
ratesPB.equals("valueDate", LocalDate.now()) ratesPB.equals("valueDate", reportDate)
) )
); );
if (!rates.isEmpty()) { if (!rates.isEmpty()) {