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 cfb621903..5c003b405 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 @@ -43,13 +43,18 @@ public class KSCommissionTradesReport { @CsvNumber(value = "#0.00", writeFormat = "#0.00") private BigDecimal sum; - @CsvBindByName(column = "REPAYM_DATE") + @CsvBindByName(column = "AGREEMENT_SETTLEMENT_DATE") @CsvBindByPosition(position = 8) @CsvDate(value = "dd.MM.yyyy") + private LocalDate agreementSettlementDate; + + @CsvBindByName(column = "REPAYM_DATE") + @CsvBindByPosition(position = 9) + @CsvDate(value = "dd.MM.yyyy") private LocalDate repaymDate; @CsvBindByName(column = "EXEC_STATUS") - @CsvBindByPosition(position = 9) + @CsvBindByPosition(position = 10) private String execStatus; @@ -132,4 +137,12 @@ public class KSCommissionTradesReport { public void setClassCode(String classCode) { this.classCode = classCode; } + + public LocalDate getAgreementSettlementDate() { + return agreementSettlementDate; + } + + public void setAgreementSettlementDate(LocalDate agreementSettlementDate) { + this.agreementSettlementDate = agreementSettlementDate; + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java index 5f96f51c6..229b37012 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java @@ -23,39 +23,51 @@ public class KSRepTradesReport { @CsvBindByPosition(position = 2) private Long trId; - @CsvBindByName(column = "FIRM_ID") + @CsvBindByName(column = "AGREEMENT_NUMBER") @CsvBindByPosition(position = 3) + private String agreementNumber; + + @CsvBindByName(column = "FIRM_ID") + @CsvBindByPosition(position = 4) private String firmId; @CsvBindByName(column = "TKR") - @CsvBindByPosition(position = 4) + @CsvBindByPosition(position = 5) private String tkr; + @CsvBindByName(column = "ACCOUNT") + @CsvBindByPosition(position = 6) + private String account; + + @CsvBindByName(column = "DEPO_ACCOUNT") + @CsvBindByPosition(position = 7) + private String depoAccount; + @CsvBindByName(column = "CASH_LIABILITY") - @CsvBindByPosition(position = 5) + @CsvBindByPosition(position = 8) @CsvNumber(value = "#0.00", writeFormat = "#0.00") private BigDecimal cashLiability; @CsvBindByName(column = "DEPO_LIABILITY") - @CsvBindByPosition(position = 6) + @CsvBindByPosition(position = 9) @CsvNumber(value = "#0", writeFormat = "#0") private BigDecimal depoLiability; @CsvBindByName(column = "TRADE_NUM") - @CsvBindByPosition(position = 7) + @CsvBindByPosition(position = 10) private Long tradeNum; @CsvBindByName(column = "CLASS_CODE") - @CsvBindByPosition(position = 8) + @CsvBindByPosition(position = 11) private String classCode; @CsvBindByName(column = "TRADE_DATE") - @CsvBindByPosition(position = 9) + @CsvBindByPosition(position = 12) @CsvDate(value = "dd.MM.yyyy'T'HH:mm:ss") private LocalDateTime tradeDate; @CsvBindByName(column = "STATUS") - @CsvBindByPosition(position = 10) + @CsvBindByPosition(position = 13) private String status; @@ -146,4 +158,28 @@ public class KSRepTradesReport { public void setStatus(String status) { this.status = status; } + + public String getAgreementNumber() { + return agreementNumber; + } + + public void setAgreementNumber(String agreementNumber) { + this.agreementNumber = agreementNumber; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getDepoAccount() { + return depoAccount; + } + + public void setDepoAccount(String depoAccount) { + this.depoAccount = depoAccount; + } } 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 22491b270..45ab2d85c 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 @@ -163,6 +163,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder { + private final DateTimeFormatter ddMMyyyyFormatter = DateTimeFormatter.ofPattern("ddMMyyyy"); + private final Imdg executionDepositImdg; private final Imdg executionFondImdg; private final Imdg sessionImdg; private final Imdg registryImdg; - private final Imdg marketImdg; private final Imdg companyImdg; private final Imdg tradingClearingRegistryImdg; + private final Imdg accountImdg; private List rows = null; @@ -47,8 +47,8 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder