From 3f0fe1d901b72be8c2f4fa634fc57baa799f07cf Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 26 Dec 2022 16:23:55 +0300 Subject: [PATCH] reports-service http://jira.mfd.msk:8088/browse/CLS-25 refactoring --- .../services/collector/Bt17_1_P1_collector.java | 15 +++++++-------- .../services/collector/Bt17_1_P2_collector.java | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java index 923144b98..d7ff636d9 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java @@ -61,20 +61,19 @@ public class Bt17_1_P1_collector extends ReportDataCollector result = new ArrayList<>(); - String ql = String.format("'%s' <= refundDate and refundDate <= '%s'", startDate, endDate); - Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql); - ClearingStatusDictionary allowClearingStatus = clearingStatusDictionaryImdg.getSingleObjectByFieldValues(Map.of("code", ALLOW_CLEARING_STATUS)); if (allowClearingStatus == null) { throw new IllegalStateException("ClearingStatusDictionary with code=\"" + ALLOW_CLEARING_STATUS + "\" not fount"); } final Long allowClearingStatusId = allowClearingStatus.getId(); // "OK" - Collection filteredLiabilities = liabilities.stream() - .filter(liability -> allowClearingStatusId.equals(liability.getClearingStatus())) - .collect(Collectors.toList()); - Map> indexByCompany = MapUtil.indexList(filteredLiabilities, LiabilitiesClaimsAssets::getCompanyId); - for (LiabilitiesClaimsAssets liability : filteredLiabilities) { + String ql = String.format("'%s' <= refundDate and refundDate <= '%s' and clearingStatus=", + startDate, endDate, allowClearingStatusId); + Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql); + + Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); + + for (LiabilitiesClaimsAssets liability : liabilities) { final Long companyId = liability.getCompanyId(); Company company = companyImdg.getSingleObjectByID(companyId); if (company != null) { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java index 2fd59d0f0..02e5587e3 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java @@ -3,7 +3,6 @@ package ru.spcex.clearing.reports.services.collector; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2;