This commit is contained in:
akulikov 2023-01-10 15:53:30 +03:00
parent d3c9bf2576
commit 66d013d554
4 changed files with 47 additions and 19 deletions

View file

@ -1,13 +1,10 @@
package ru.spcex.clearing.reports.services; package ru.spcex.clearing.reports.services;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.spcex.clearing.reports.reports.AbstractReport; import ru.spcex.clearing.reports.reports.AbstractReport;
import java.time.LocalDate; import java.time.LocalDate;
public abstract class ReportWithPeriodCollector<T extends AbstractReport> extends AbstractReportCollector<T> { public abstract class ReportWithPeriodCollector<T extends AbstractReport> extends AbstractReportCollector<T> {
protected final Logger log = LoggerFactory.getLogger(getClass());
/** /**
* Подготовка отчета на период startDate..endDate * Подготовка отчета на период startDate..endDate

View file

@ -266,22 +266,22 @@ public class ReportsService {
/* ========= БТ 13 ========== */ /* ========= БТ 13 ========== */
ReportDOCIN report_bt13_11 = new ReportDOCIN(LocalDate.now(), // ReportDOCIN report_bt13_11 = new ReportDOCIN(LocalDate.now(),
LocalTime.now(), // LocalTime.now(),
"inDocumentJournalRegistrationDate", // "inDocumentJournalRegistrationDate",
"inDocumentJournalRegistrationTime", // "inDocumentJournalRegistrationTime",
"inDocumentJournalRegistrationNumber", // "inDocumentJournalRegistrationNumber",
"inDocumentJournalDocumentName" , // "inDocumentJournalDocumentName" ,
"inDocumentJournalSender", // "inDocumentJournalSender",
"inDocumentJournalQuality", // "inDocumentJournalQuality",
"inDocumentJournalClearingCode", // "inDocumentJournalClearingCode",
"inDocumentJournalCourierType", // "inDocumentJournalCourierType",
"inDocumentJournalEmailDate", // "inDocumentJournalEmailDate",
"inDocumentJournalAmount", // "inDocumentJournalAmount",
"inDocumentJournalDossierNumber", // "inDocumentJournalDossierNumber",
"inDocumentJournalComment", // "inDocumentJournalComment",
"inDocumentJournalReceiptDate"); // "inDocumentJournalReceiptDate");
log.info("Report_BT13_11:\n{}\n", xStream.toXML(report_bt13_11)); // log.info("Report_BT13_11:\n{}\n", xStream.toXML(report_bt13_11));
Report_BT13_12 report_bt13_12 = new Report_BT13_12(LocalDate.now(), Report_BT13_12 report_bt13_12 = new Report_BT13_12(LocalDate.now(),
LocalTime.now(), LocalTime.now(),

View file

@ -0,0 +1,10 @@
package ru.spcex.clearing.reports.services;
import ru.spcex.clearing.reports.reports.AbstractReport;
public abstract class SimpleReportCollector<T extends AbstractReport> extends AbstractReportCollector<T> {
/**
* Подготовка отчета (без входных параметров)
*/
abstract public T collectReport();
}

View file

@ -0,0 +1,21 @@
package ru.spcex.clearing.reports.services.collector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.spcex.clearing.reports.reports.bt_13.ReportDOCIN;
import ru.spcex.clearing.reports.services.SimpleReportCollector;
public class ReportDOCIN_Collector extends SimpleReportCollector<ReportDOCIN> {
protected final Logger log = LoggerFactory.getLogger(getClass());
@Override
public ReportDOCIN collectReport() {
return null;
}
@Override
public Class<ReportDOCIN> getReportClass() {
return ReportDOCIN.class;
}
}