treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-317

Browse source 
Привел конце документа ДФ-12
This commit is contained in:
psemenkov 2023-08-03 17:42:47 +03:00
parent 9208483045
commit 7d51561c71
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/AbstractExporterService.java
View file

@ -13,10 +13,14 @@ import ru.spcex.platform.enumeration.SwtTable;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import java.io.*; import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.Collection;
import java.util.Objects;
import java.util.Optional;
import static ru.spcex.clearing.platform.messaging.domain.Consts.JOURNAL_SERVICE; import static ru.spcex.clearing.platform.messaging.domain.Consts.JOURNAL_SERVICE;
@ -135,8 +139,8 @@ public abstract class AbstractExporterService<T extends SpcexObjectBase> {
protected void makeSWTData(SWTHeaderData header, Collection<T> records, OutputStream outStream) { protected void makeSWTData(SWTHeaderData header, Collection<T> records, OutputStream outStream) {
try (PrintWriter out = new PrintWriter(outStream)) { try (PrintWriter out = new PrintWriter(outStream)) {
out.print(header.buildString()); out.print(header.buildString());
int counter = 1; // нумерация начинается с 1
int totalSize = records.size(); int totalSize = records.size();
int counter = totalSize == 0 ? 0 : 1; // нумерация начинается с 1
for (T row : records) { for (T row : records) {
ConvertionContext context = new ConvertionContext(mapClass, counter, totalSize); ConvertionContext context = new ConvertionContext(mapClass, counter, totalSize);
String data = convertRecord(row, context); String data = convertRecord(row, context);

4
clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java
View file

@ -97,7 +97,7 @@ public class DF12Exporter extends AbstractExporterService<SDf12> {
@Override @Override
protected void writeFooter(PrintWriter out, Collection<SDf12> records, int counter) { protected void writeFooter(PrintWriter out, Collection<SDf12> records, int counter) {
String footerCheckSum = counter + lineSeparator + records.size() + lineSeparator; // String footerCheckSum = counter + lineSeparator + records.size() + lineSeparator;
out.print(footerCheckSum); // out.print(footerCheckSum);
} }
} }