diff --git a/clearing-parent/reports-service/docs/report.BR для разработчиков.docx b/clearing-parent/reports-service/docs/report.BR для разработчиков.docx new file mode 100644 index 000000000..d6d6bd7fc Binary files /dev/null and b/clearing-parent/reports-service/docs/report.BR для разработчиков.docx differ diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_3/ReportBR_0420318.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_3/ReportBR_0420318.java index df5aedc3c..fc66f6abb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_3/ReportBR_0420318.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_3/ReportBR_0420318.java @@ -34,7 +34,7 @@ public class ReportBR_0420318 extends AbstractReport { private String liabilitiesClaimsAssetsFullName; @XStreamAsAttribute - @XStreamAlias("CompanySymbols_code") + @XStreamAlias("companySymbols_code") private String companySymbolsCode; @XStreamAsAttribute diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P10.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P10.java index 021fb5ec2..ab24a7a0c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P10.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P10.java @@ -9,7 +9,7 @@ import java.time.LocalDate; @XStreamAlias("report") public class ReportBR_0420312_P10 extends AbstractReport { - @XStreamAlias("partThree") + @XStreamAlias("partTen") private final Info_0420312_P10 partTen; public ReportBR_0420312_P10(LocalDate startDate, diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P11.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P11.java new file mode 100644 index 000000000..3f08e4f46 --- /dev/null +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P11.java @@ -0,0 +1,35 @@ +package ru.spcex.clearing.reports_service.reports.bt_17_5; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import ru.spcex.clearing.reports_service.reports.AbstractReport; + +import java.time.LocalDate; + +@XStreamAlias("report") +public class ReportBR_0420312_P11 extends AbstractReport { + + @XStreamAlias("partEleven") + private final Info_0420312_P11 partEleven; + + public ReportBR_0420312_P11(LocalDate startDate, + LocalDate endDate, + String liabilitiesAmount) { + super("0.0.5", + "0420312", + "Сведения о клиринговом обеспечении", + startDate, + endDate); + partEleven = new Info_0420312_P11(liabilitiesAmount); + } + + public static class Info_0420312_P11 { + @XStreamAsAttribute + @XStreamAlias("liabilities_amount") + private String liabilitiesAmount; + + public Info_0420312_P11(String liabilitiesAmount) { + this.liabilitiesAmount = liabilitiesAmount; + } + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P3.java index 521f6d0bd..c77e200c2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P3.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P3.java @@ -30,7 +30,7 @@ public class ReportBR_0420312_P3 extends AbstractReport { private String liabilitiesClaimsAssetsCompanyId; @XStreamAsAttribute - @XStreamAlias("liabilitiesClaimsAssets_fullName") + @XStreamAlias("liabilitiesClaimsAssets_liabilities") private String liabilitiesClaimsAssetsLiabilities; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P4.java index f9e7b695c..28df729dc 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P4.java @@ -9,7 +9,7 @@ import java.time.LocalDate; @XStreamAlias("report") public class ReportBR_0420312_P4 extends AbstractReport { - @XStreamAlias("partThree") + @XStreamAlias("partFour") private final Info_0420312_P4 partFour; public ReportBR_0420312_P4(LocalDate startDate, diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P5.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P5.java index 154536139..5702d7a28 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P5.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P5.java @@ -9,7 +9,7 @@ import java.time.LocalDate; @XStreamAlias("report") public class ReportBR_0420312_P5 extends AbstractReport { - @XStreamAlias("partThree") + @XStreamAlias("partFive") private final Info_0420312_P5 partFive; public ReportBR_0420312_P5(LocalDate startDate, diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P6.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P6.java index 41d1200dc..12abe818d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P6.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P6.java @@ -9,7 +9,7 @@ import java.time.LocalDate; @XStreamAlias("report") public class ReportBR_0420312_P6 extends AbstractReport { - @XStreamAlias("partThree") + @XStreamAlias("partSix") private final Info_0420312_P6 partSix; public ReportBR_0420312_P6(LocalDate startDate, diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P8.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P8.java index 3e26fcea5..6a92fb8bc 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P8.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P8.java @@ -9,7 +9,7 @@ import java.time.LocalDate; @XStreamAlias("report") public class ReportBR_0420312_P8 extends AbstractReport { - @XStreamAlias("partThree") + @XStreamAlias("partEight") private final Info_0420312_P8 partEight; public ReportBR_0420312_P8(LocalDate startDate, diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P9.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P9.java new file mode 100644 index 000000000..c118a1cf0 --- /dev/null +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/bt_17_5/ReportBR_0420312_P9.java @@ -0,0 +1,84 @@ +package ru.spcex.clearing.reports_service.reports.bt_17_5; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import ru.spcex.clearing.reports_service.reports.AbstractReport; + +import java.time.LocalDate; + +@XStreamAlias("report") +public class ReportBR_0420312_P9 extends AbstractReport { + + @XStreamAlias("partNine") + private final Info_0420312_P9 partNine; + + public ReportBR_0420312_P9(LocalDate startDate, + LocalDate endDate, + String currencyId, + String liabilitiesClaimsAssetsCompanyId, + String liabilitiesClaimsAssetsFullName, + String companySymbolCode, + String companySymbolValue, + String companyInfoCountryCode, + String clearingMemberCategoryClearingMemberCategory) { + super("0.0.5", + "0420312", + "Сведения о клиринговом обеспечении", + startDate, + endDate); + partNine = new Info_0420312_P9(currencyId, + liabilitiesClaimsAssetsCompanyId, + liabilitiesClaimsAssetsFullName, + companySymbolCode, + companySymbolValue, + companyInfoCountryCode, + clearingMemberCategoryClearingMemberCategory); + } + + public static class Info_0420312_P9 { + @XStreamAsAttribute + @XStreamAlias("currency_id") + private String currencyId; + + @XStreamAsAttribute + @XStreamAlias("liabilitiesClaimsAssets_companyId") + private String liabilitiesClaimsAssetsCompanyId; + + @XStreamAsAttribute + @XStreamAlias("liabilitiesClaimsAssets_fullName") + private String liabilitiesClaimsAssetsFullName; + + @XStreamAsAttribute + @XStreamAlias("companySymbol_code") + private String companySymbolCode; + + @XStreamAsAttribute + @XStreamAlias("companySymbol_value") + private String companySymbolValue; + + @XStreamAsAttribute + @XStreamAlias("companyInfo_countryCode") + private String companyInfoCountryCode; + + @XStreamAsAttribute + @XStreamAlias("clearingMemberCategory_clearingMemberCategory") + private String clearingMemberCategoryClearingMemberCategory; + + + public Info_0420312_P9(String currencyId, + String liabilitiesClaimsAssetsCompanyId, + String liabilitiesClaimsAssetsFullName, + String companySymbolCode, + String companySymbolValue, + String companyInfoCountryCode, + String clearingMemberCategoryClearingMemberCategory) { + this.currencyId = currencyId; + this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId; + this.liabilitiesClaimsAssetsFullName = liabilitiesClaimsAssetsFullName; + this.companySymbolCode = companySymbolCode; + this.companySymbolValue = companySymbolValue; + this.companyInfoCountryCode = companyInfoCountryCode; + this.clearingMemberCategoryClearingMemberCategory = clearingMemberCategoryClearingMemberCategory; + } + } +}