diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTHeaderData.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTHeaderData.java index 40e6740b4..7c9d9255e 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTHeaderData.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTHeaderData.java @@ -24,6 +24,10 @@ public class SWTHeaderData { return to; } + public void setTo(String to) { + this.to = to; + } + public String getValFor76Tag() { return valFor76Tag; } @@ -40,10 +44,6 @@ public class SWTHeaderData { this.valFor77ATag = valFor77ATag; } - public void setTo(String to) { - this.to = to; - } - public String getFrom() { return from; } @@ -68,6 +68,10 @@ public class SWTHeaderData { this.dateTime = dateTime; } + public void setDateTime(String dateTime) { + this.dateTime = LocalDateTime.from(dtInFileHeaderFormatter.parse(dateTime)); + } + public String getValFor20Tag() { return valFor20Tag; } diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java index 1aedb5f71..87f95c629 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java @@ -32,13 +32,18 @@ S_DF_10 S_DF_13 * */ String line = scanner.nextLine(); - to = line.substring(line.lastIndexOf("To:")); + to = line.substring(line.lastIndexOf("To:") + "To:".length()); line = scanner.nextLine(); - from = line.substring(line.lastIndexOf("From:")); + from = line.substring(line.lastIndexOf("From:") + "From:".length()); line = scanner.nextLine(); - type = line.substring(line.lastIndexOf("Type:")); + type = line.substring(line.lastIndexOf("Type:") + "Type:".length()); line = scanner.nextLine(); - dateTime = line.substring(line.lastIndexOf("Date/Time:")); + dateTime = line.substring(line.lastIndexOf("Date/Time:") + "Date/Time:".length()); + swtHeaderData.setTo(to); + swtHeaderData.setFrom(from); + swtHeaderData.setType(type); + swtHeaderData.setDateTime(dateTime); + switch (resultContainer.getSwtTable()) { case S_DF_08: { String val20, val21, val18A; @@ -48,11 +53,11 @@ S_DF_13 :18A:46 * */ line = scanner.nextLine(); - val20 = line.substring(line.lastIndexOf(":20:")); + val20 = line.substring(line.lastIndexOf(":20:") + ":20:".length()); line = scanner.nextLine(); - val21 = line.substring(line.lastIndexOf(":21:")); + val21 = line.substring(line.lastIndexOf(":21:") + ":21:".length()); line = scanner.nextLine(); - val18A = line.substring(line.lastIndexOf(":18A:")); + val18A = line.substring(line.lastIndexOf(":18A:") + ":18A:".length()); swtHeaderData.setValFor20Tag(val20); swtHeaderData.setValFor21Tag(val21); swtHeaderData.setValFor18ATag(val18A); @@ -64,7 +69,7 @@ S_DF_13 * */ String val20; line = scanner.nextLine(); - val20 = line.substring(line.lastIndexOf(":20:")); + val20 = line.substring(line.lastIndexOf(":20:") + ":20:".length()); swtHeaderData.setValFor20Tag(val20); } break;