diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java index 766cff4a1..70d706c99 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java @@ -38,7 +38,7 @@ public class ReportBR_0420315_P1 extends ReportWithClearingStatus { this.destination = Destination.BR.getKey(); this.clearingMemberCategory = "%s,%s".formatted( ClearingMemberCategoryD.I.getKey(), - "V" + ClearingMemberCategoryD.V.getKey() ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java index fe9112dff..1dc18552b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java @@ -6,22 +6,21 @@ import ru.spcex.clearing.reports.reports.Destination; import ru.spcex.clearing.reports.reports.ReportId; import ru.spcex.clearing.reports.reports.ReportWithPeriod; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @XStreamAlias("clearedLiabilitiesTotal") public class ReportBR_0420315_P2 extends ReportWithPeriod { @XStreamAlias("rows") - private final Info_0420315_P2 rows; + private Info_0420315_P2 rows; + @XStreamAsAttribute @XStreamAlias("destination") private String destination; public ReportBR_0420315_P2(LocalDate startDate, - LocalDate endDate, - String destination, - String contractQty, - String liabilitiesAmount) { + LocalDate endDate) { super(ReportId.BR_0420315_P2, "0.0.1", "0420315", @@ -29,11 +28,6 @@ public class ReportBR_0420315_P2 extends ReportWithPeriod { startDate, endDate); this.destination = Destination.BR.getKey(); - rows = new Info_0420315_P2(contractQty, liabilitiesAmount); - } - - public Info_0420315_P2 getRows() { - return rows; } @Override @@ -45,8 +39,16 @@ public class ReportBR_0420315_P2 extends ReportWithPeriod { ); } - public record Info_0420315_P2(@XStreamAlias("contract_qty") @XStreamAsAttribute String contractQty, - @XStreamAlias("liabilities_amount") @XStreamAsAttribute String liabilitiesAmount) { + public Info_0420315_P2 getRows() { + return rows; + } + + public void setRows(Info_0420315_P2 rows) { + this.rows = rows; + } + + public record Info_0420315_P2(@XStreamAlias("contract_qty") @XStreamAsAttribute BigDecimal contractQty, + @XStreamAlias("liabilities_amount") @XStreamAsAttribute BigDecimal liabilitiesAmount) { } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java index af76e94ba..11fbba516 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java @@ -66,12 +66,12 @@ public class ReportsService { - ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(LocalDate.now(), - LocalDate.now(), - "BR", - "contractorQty", - "liabilitiesAmount"); - log.info("ReportBR_0420315_P2:\n{}\n", xStream.toXML(reportBR_0420315_p2)); +// ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(LocalDate.now(), +// LocalDate.now(), +// "BR", +// "contractorQty", +// "liabilitiesAmount"); +// log.info("ReportBR_0420315_P2:\n{}\n", xStream.toXML(reportBR_0420315_p2)); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java index bfca1159b..eb9ca593e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java @@ -20,6 +20,7 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.time.TimeUtil; +import java.math.BigDecimal; import java.time.Instant; import java.time.LocalDate; import java.util.*; @@ -27,7 +28,6 @@ import java.util.*; @Component public class ReportBR_0420315_Collector extends ReportDataCollector { protected static final List ALLOW_CLEARING_MEMBER_CATEGORY = Arrays.asList(ClearingCategory.I.getKey(), ClearingCategory.V.getKey()); - protected static final String ALLOW_CLEARING_STATUS = ClearingStatus.OK.getKey(); private Imdg companyImdg; private Imdg liabilitiesClaimsAssetsImdg; @@ -74,8 +74,7 @@ public class ReportBR_0420315_Collector extends ReportDataCollector liabilities = searchLiabilitiesClaimsAssets(startDate, endDate, allowClearingStatusId); @@ -99,10 +98,10 @@ public class ReportBR_0420315_Collector extends ReportDataCollector onMarket = new HashSet<>(); long contractorQty; - double liabilitiesAmount = 0; + BigDecimal liabilitiesAmount = BigDecimal.ZERO; { - HashSet collectedToSumm = new HashSet<>(); // чтобы дважды не посчитать 1 и тот же контракт - HashSet onMarketSecurity=new HashSet<>(); + HashSet collectedToSum = new HashSet<>(); // чтобы дважды не посчитать 1 и тот же контракт + HashSet onMarketSecurity = new HashSet<>(); for (LiabilitiesClaimsAssets lContract : liabilitiesOfCompany) { if (!onMarketSecurity.contains(lContract.getSecurityId())) { Listing listing = findListing(Market.mkrs, lContract.getSecurityId()); @@ -112,12 +111,12 @@ public class ReportBR_0420315_Collector extends ReportDataCollector