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_P1_Collector.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java index e25acfdce..a3c1b5268 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_P1_Collector.java @@ -25,7 +25,7 @@ import java.time.LocalDate; import java.util.*; @Component -public class ReportBR_0420315_Collector extends ReportWithPeriodCollector { +public class ReportBR_0420315_P1_Collector extends ReportWithPeriodCollector { protected static final List ALLOW_CLEARING_MEMBER_CATEGORY = Arrays.asList(ClearingCategory.I.getKey(), ClearingCategory.V.getKey()); private Imdg companyImdg; @@ -35,7 +35,7 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector listingImdg; @Autowired - public ReportBR_0420315_Collector(ImdgProvider imdgProvider) { + public ReportBR_0420315_P1_Collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); @@ -99,7 +99,7 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector collectedToSum = new HashSet<>(); // чтобы дважды не посчитать 1 и тот же контракт + HashSet collectedContract = new HashSet<>(); HashSet onMarketSecurity = new HashSet<>(); for (LiabilitiesClaimsAssets lContract : liabilitiesOfCompany) { if (!onMarketSecurity.contains(lContract.getSecurityId())) { @@ -109,13 +109,12 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector liabilities = searchLiabilitiesClaimsAssets(startDate, endDate); - long contractorQty; - double liabilitiesAmount = 0; + long liabilitiesAmount; + BigDecimal contractorQty = BigDecimal.ZERO; { HashSet collectedToSumm = new HashSet<>(); for (LiabilitiesClaimsAssets lContract : liabilities) { - if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract()) - && !collectedToSumm.contains(lContract.getContract())) { + if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())) { collectedToSumm.add(lContract.getContract()); - liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue(); + contractorQty = contractorQty.add(lContract.getLiabilitiesQuantity()); } } - contractorQty = collectedToSumm.size(); + liabilitiesAmount = collectedToSumm.size(); } -// ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate, -// "BR", -// toString(contractorQty), -// toString(liabilitiesAmount)); + ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate); + reportBR_0420315_p2.setRows(new ReportBR_0420315_P2.Info_0420315_P2(toString(contractorQty), + toString(liabilitiesAmount))); -// return reportBR_0420315_p2; - return null; + return reportBR_0420315_p2; } @Override