From 4ffdf50b3936ba9e1e9ca85cd142287263945c9f Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 11 Jan 2023 12:17:17 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20=D1=80=D0=B5=D1=84=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20ReportBR=5F0420315?=
 =?UTF-8?q?=5FP*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReportBR_0420315_P1_Collector.java        | 23 ++++---------------
 .../ReportBR_0420315_P2_collector.java        | 14 +----------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java
index a3c1b5268..20d520210 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java
@@ -55,27 +55,13 @@ public class ReportBR_0420315_P1_Collector extends ReportWithPeriodCollector<Rep
         return listingImdg.getSingleObjectByFieldValues(qParam);
     }
 
-    Collection<LiabilitiesClaimsAssets> searchLiabilitiesClaimsAssets(LocalDate startDate, LocalDate endDate, Long allowClearingStatusId) {
-        //        String ql = String.format("'%s' <= refundDate and refundDate <= '%s' and clearingStatus=%s",
-//                formatToIMDGInstant(startDate), formatToIMDGInstant(endDate), allowClearingStatusId);
-//        Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql);
-
-        ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder();
-        Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
-        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi),
-                pb.equals("clearingStatus", allowClearingStatusId));
-        Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p);
-        return liabilities;
-    }
-
     @Override
     public ReportBR_0420315_P1 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) {
         validateDateRange(startDate, endDate);
         ReportBR_0420315_P1 reportBR_0420315_p1 = new ReportBR_0420315_P1(startDate, endDate);
         final Long allowClearingStatusId = MapUtil.getDictionaryIdByCode(clearingStatusDictionaryImdg, ClearingStatus.OK.getKey());
 
-        Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate, allowClearingStatusId);
+        Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate, allowClearingStatusId);
 
         Map<Long, List<LiabilitiesClaimsAssets>> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId);
         company_for:
@@ -104,7 +90,7 @@ public class ReportBR_0420315_P1_Collector extends ReportWithPeriodCollector<Rep
                     for (LiabilitiesClaimsAssets lContract : liabilitiesOfCompany) {
                         if (!onMarketSecurity.contains(lContract.getSecurityId())) {
                             Listing listing = findListing(Market.mkrs, lContract.getSecurityId());
-                            if (listing!= null) {
+                            if (listing != null) {
                                 onMarket.add(listing.getMarket());
                             }
                             onMarketSecurity.add(lContract.getSecurityId());
@@ -120,8 +106,9 @@ public class ReportBR_0420315_P1_Collector extends ReportWithPeriodCollector<Rep
                 if (onMarket.size() != 1) { // Сейчас по коду ожидается один listing.market="MKRS" но потом могут быть несколько
                     log.warn("Market for companyId[{}]: {}", companyId, onMarketString);
                 }
-                ReportBR_0420315_P1.Info_0420315_P1 info_0420315_p1 = new ReportBR_0420315_P1.Info_0420315_P1(company.getId().toString(),
-                        company.getFullName(),
+                ReportBR_0420315_P1.Info_0420315_P1 info_0420315_p1 = new ReportBR_0420315_P1.Info_0420315_P1(
+                        company.getId().toString(),
+                        toString(company.getFullName()),
                         onMarketString,
                         toString(contractorQty),
                         toString(liabilitiesAmount));
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java
index c4a0d72da..31a0e8f4e 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java
@@ -27,22 +27,10 @@ public class ReportBR_0420315_P2_collector extends ReportWithPeriodCollector<Rep
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 
-    Collection<LiabilitiesClaimsAssets> searchLiabilitiesClaimsAssets(LocalDate startDate, LocalDate endDate) {
-//        String ql = String.format("'%s' <= refundDate and refundDate <= '%s'", formatToIMDGInstant(startDate), formatToIMDGInstant(endDate));
-//        Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql);
-
-        ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder();
-        Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
-        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi));
-        Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p);
-        return liabilities;
-    }
-
     @Override
     public ReportBR_0420315_P2 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) {
         validateDateRange(startDate, endDate);
-        Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate);
+        Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate);
 
         long liabilitiesAmount;
         BigDecimal contractorQty = BigDecimal.ZERO;