diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java index 009ccbc27..5deb8290a 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java @@ -3,7 +3,9 @@ package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvDate; +import com.opencsv.bean.CsvNumber; +import java.math.BigDecimal; import java.time.LocalDate; public class UnfulfilledDealReport { @@ -25,6 +27,11 @@ public class UnfulfilledDealReport { @CsvBindByPosition(position = 3) private String settleCode; + @CsvBindByName(column = "VALUE") + @CsvBindByPosition(position = 4) + @CsvNumber(value = "#0.00", writeFormat = "#0.00") + private BigDecimal value; + public String getSecurityId() { return securityId; @@ -58,4 +65,11 @@ public class UnfulfilledDealReport { this.settleCode = settleCode; } + public BigDecimal getValue() { + return value; + } + + public void setValue(BigDecimal value) { + this.value = value; + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java index ce17130d2..fa91651d9 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java @@ -89,6 +89,7 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder registryImdg; private final Imdg companyImdg; - private final Imdg companySymbolsImdg; private final Imdg executionDepositImdg; private List rows = null; @@ -38,7 +36,6 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate); @@ -125,29 +121,12 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder