diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java index 5b3031872..d6a1eec4b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java @@ -57,6 +57,10 @@ public class KSCommissionTradesReport { @CsvBindByPosition(position = 10) private String execStatus; + @CsvBindByName(column = "TR_ID") + @CsvBindByPosition(position = 11) + private Long trId; + public String getFirmId() { return firmId; @@ -145,4 +149,12 @@ public class KSCommissionTradesReport { public void setAgreementSettlementDate(LocalDate agreementSettlementDate) { this.agreementSettlementDate = agreementSettlementDate; } + + public Long getTrId() { + return trId; + } + + public void setTrId(Long trId) { + this.trId = trId; + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java index 8d29bcf51..37c269d08 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java @@ -125,8 +125,17 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder