From 595ef708ac9a31546522e4dc229e7e43d0a95ab5 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 11 Jan 2023 15:00:59 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-27=20=D0=BD=D0=B5=20=D0=BD=D0=B0=D0=B4=D0=BE=20=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collector/ReportBR_0420318_Collector.java | 41 ++++++-------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java
index 58f853637..fc0db50b7 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java
@@ -67,58 +67,41 @@ public class ReportBR_0420318_Collector extends ReportWithPeriodCollector<Report
             Company company = companyImdg.getSingleObjectByID(companyId);
             CompanySymbols companySymbolINN = findSymbol(DocumentTypes.inn, company.getId());
 
-            Instant liabilitiesClaimsAssets_settlementDate = null;
             Collection<ClearingMemberCategory> cmcLst = clearingMemberCategoryImdg.getCollectionObjectsByFieldValues(Map.of("companyId", companyId));
 
             boolean checkCategoryB = cmcLst.stream().anyMatch(cmc -> ClearingCategory.B.equalsByKey(cmc.getClearingMemberCategory()));
             boolean checkCategoryIV = cmcLst.stream().anyMatch(cmc -> ClearingCategory.I.equalsByKey(cmc.getClearingMemberCategory()) || ClearingCategory.V.equalsByKey(cmc.getClearingMemberCategory()));
 
-            Map<String, List<LiabilitiesClaimsAssets>> indexByCurrency = MapUtil.indexList(liabilitiesByCompany, LiabilitiesClaimsAssets::getCurrency);
-
-            for (Map.Entry<String, List<LiabilitiesClaimsAssets>> entryCurrency: indexByCurrency.entrySet()) {
-                final String currencyCode = entryCurrency.getKey();
-                final List<LiabilitiesClaimsAssets> claimsAssets = entryCurrency.getValue();
-                LiabilitiesClaimsAssets firstLiability = claimsAssets.get(0);
+            for (LiabilitiesClaimsAssets liability : liabilitiesByCompany) {
+                final String currencyCode = liability.getCurrency();
 
+                Instant liabilitiesClaimsAssets_settlementDate = null;
                 if (checkCategoryB) {
-                    liabilitiesClaimsAssets_settlementDate = firstLiability.getRefundDate();
+                    liabilitiesClaimsAssets_settlementDate = liability.getRefundDate();
                 }
                 if (checkCategoryIV) {
-                    liabilitiesClaimsAssets_settlementDate = firstLiability.getSettlementDate();
+                    liabilitiesClaimsAssets_settlementDate = liability.getSettlementDate();
                 }
 
-                BigDecimal liabilitiesClaimsAssets_liabilitiesQuantity = claimsAssets.stream()
-                        .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity)
-                        .filter(Objects::nonNull)
-                        .reduce(BigDecimal::add)
-                        .orElse(BigDecimal.ZERO);
+                BigDecimal liabilitiesClaimsAssets_liabilitiesQuantity = liability.getLiabilitiesQuantity();
 
                 LiabilitiesClaimsMoney liabilitiesClaimsMoney = liabilitiesClaimsMoneyImdg.getSingleObjectByFieldValues(Map.of("currency", currencyCode));
 
-                long liabilitiesCount = claimsAssets.size();
-                String contracts = claimsAssets.stream()
-                        .map(LiabilitiesClaimsAssets::getContract)
-                        .distinct()
-                        .collect(Collectors.joining(","));
-                String comments = claimsAssets.stream()
-                        .map(LiabilitiesClaimsAssets::getContract)
-                        .filter(Objects::nonNull)
-                        .distinct()
-                        .collect(Collectors.joining(","));
+                BigDecimal liabilitiesCount = liability.getClaimsQuantity();
 
                 ReportBR_0420318.Info_0420318 info_0420318 = new ReportBR_0420318.Info_0420318(
-                        toString(firstLiability.getFullName()),
+                        toString(liability.getFullName()),
                         toString(companySymbolINN == null ? null : companySymbolINN.getCompanySymbolValue()),
                         toString(company.getProfile().getCountryCode()),
                         toString(liabilitiesClaimsAssets_settlementDate),
-                        toString(contracts),
+                        toString(liability.getContract()),
                         toString(currencyCode),
                         toString(liabilitiesClaimsAssets_liabilitiesQuantity),
                         liabilitiesClaimsMoney == null ? "" : toString(liabilitiesClaimsMoney.getFullName()),
                         toString(liabilitiesCount),
-                        toString(comments),
-                        companySymbolINN == null ? "" : toString(companySymbolINN.getCompanySymbolValue()), // второй раз по ТЗ
-                        toString(firstLiability.getFullName())
+                        toString(liability.getComment()),
+                        companySymbolINN == null ? "" : toString(companySymbolINN.getCompanySymbolValue()),
+                        toString(liability.getFullName())
                 );
                 reportBR_0420318.getRows().add(info_0420318);
             }