diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java index 93d188971..0b4314f9f 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java @@ -2,7 +2,6 @@ package ru.spcex.clearing.swt.exporter.services.exportimpl; import com.hazelcast.aws.utility.StringUtil; import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf11; import ru.clearing.classes.statics.data.sdf.SDf12; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; @@ -59,8 +58,6 @@ public class DF12Exporter extends AbstractExporterService { @Override protected String convertRecord(SDf12 record, ConvertionContext context) { StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(context.getCountOfRecord()).append(lineSeparator); - stringBuilder.append(context.getTotalCountOfRecords()).append(lineSeparator); if (!Objects.equals(lastHeader20, record.getOutDocument())) { // header stringBuilder.append(":20:").append(record.getOutDocument()).append(lineSeparator); lastHeader20 = record.getOutDocument(); @@ -70,6 +67,8 @@ public class DF12Exporter extends AbstractExporterService { stringBuilder.append(":35B:ISIN ").append(record.getSecurityCode()).append(lineSeparator); stringBuilder.append(":82D:").append(record.getDepoCodeSender()).append(lineSeparator); stringBuilder.append(":87C:").append(record.getDepoCodeAdressee()).append(lineSeparator); + stringBuilder.append(context.getCountOfRecord()).append(lineSeparator); + stringBuilder.append(context.getTotalCountOfRecords()).append(lineSeparator); return stringBuilder.toString(); } @@ -99,7 +98,5 @@ public class DF12Exporter extends AbstractExporterService { protected void writeFooter(PrintWriter out, Collection records, int counter) { String footerCheckSum = counter + lineSeparator + records.size() + lineSeparator; out.print(footerCheckSum); - String shsCheckSum = "SHS" + countIssues(records); - out.print(shsCheckSum); } }