diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java index 2a5421f51..fa56f33a8 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java @@ -48,6 +48,10 @@ public class KSRepCashRegisterSumsReport { @CsvBindByPosition(position = 8) private String operType; + @CsvBindByName(column = "CURRENCY") + @CsvBindByPosition(position = 9) + private String currency; + public String getFirmId() { return firmId; @@ -120,4 +124,12 @@ public class KSRepCashRegisterSumsReport { public void setOperType(String operType) { this.operType = operType; } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java index 59593ec84..3a7b48dec 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java @@ -78,11 +78,11 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate); @@ -92,8 +92,8 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder pairRegistries = registryImdg.getCollectionObjectsByPredicate( - pb.and( - pb.equals("tradingCode", registry.getTradingCode()), - pb.equals("account", registry.getAccount()), - pairRegistryPredicate - ) + pb.and( + pb.equals("tradingCode", registry.getTradingCode()), + pb.equals("account", registry.getAccount()), + pairRegistryPredicate + ) ); - if (pairRegistries.isEmpty()) log.warn("Pair AM_T registry for registry (id = {}) not found", registry.getId()); + if (pairRegistries.isEmpty()) + log.warn("Pair AM_T registry for registry (id = {}) not found", registry.getId()); pairRegistry = pairRegistries.iterator().next(); if (pairRegistries.size() > 1) { log.warn("For registry (id = {}) found > 1 AM_T registry, use first (id = {})", - registry.getId(), - pairRegistry.getId()); + registry.getId(), + pairRegistry.getId()); } String account = null; @@ -121,8 +122,8 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder