diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java index 990dbf12f..07544db40 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java @@ -10,11 +10,8 @@ import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P9; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; 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.math.BigDecimal; -import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; @@ -34,26 +31,13 @@ public class ReportBR_0420312_P9_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_P9 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { validateDateRange(startDate, endDate); ReportBR_0420312_P9 reportBR_0420312P9 = new ReportBR_0420312_P9(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()) { @@ -71,7 +55,7 @@ public class ReportBR_0420312_P9_collector extends ReportWithPeriodCollector