diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java similarity index 74% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java index 45cd9b180..ddaeb3326 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java @@ -13,17 +13,14 @@ import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; import ru.spcex.platform.enumeration.DocumentTypes; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; import java.util.Map; @Component -public class ReportBR_0420312_P8_collector extends ReportWithPeriodCollector { +public class ReportBR_0420312_P8_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg companySymbolsImdg; private Imdg clearingMemberCategoryImdg; @@ -31,7 +28,7 @@ public class ReportBR_0420312_P8_collector extends ReportWithPeriodCollector currencyCodeDictionaryImdg; @Autowired - public ReportBR_0420312_P8_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P8_Collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); @@ -47,25 +44,13 @@ public class ReportBR_0420312_P8_collector extends ReportWithPeriodCollector searchLiabilitiesClaimsAssets(LocalDate startDate, LocalDate endDate) { -// String ql = String.format("'%s' <= refundDate and refundDate <= '%s'", formatToIMDGInstant(startDate), formatToIMDGInstant(endDate)); -// Collection 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 liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p); - return liabilities; - } - @Override public ReportBR_0420312_P8 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { validateDateRange(startDate, endDate); ReportBR_0420312_P8 reportBR_0420312P8 = new ReportBR_0420312_P8(startDate, endDate); - Collection liabilities = searchLiabilitiesClaimsAssets(startDate, endDate); + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); for (Map.Entry> companyEntry : indexByCompany.entrySet()) { @@ -92,11 +77,11 @@ public class ReportBR_0420312_P8_collector extends ReportWithPeriodCollector