diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java similarity index 93% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java index dc42e8d5d..bb90398c2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java @@ -14,10 +14,7 @@ import ru.spcex.platform.enumeration.ClearingStatus; 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.Map; @@ -26,7 +23,7 @@ import java.util.Map; * accountTransactionLiabilities */ @Component -public class ReportBR_0420314_P1_collector extends ReportWithPeriodCollector { +public class ReportBR_0420314_P1_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg companySymbolsImdg; private Imdg clearingMemberCategoryImdg; @@ -36,7 +33,7 @@ public class ReportBR_0420314_P1_collector extends ReportWithPeriodCollector { +public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg paymentInstructionImdg; private Imdg accountBalanceImdg; private Imdg profileDocumentImdg; @Autowired - public ReportBR_0420314_P2_collector(ImdgProvider imdgProvider) { + public ReportBR_0420314_P2_Collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); paymentInstructionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class); accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class);