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

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

Browse source 
---
fix up
This commit is contained in:
aalehin 2023-05-30 17:54:29 +03:00
parent 88068659cf
commit 2c2e0a699a
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTHeaderData.java
View file

@ -24,6 +24,10 @@ public class SWTHeaderData {
return to; return to;
} }
public void setTo(String to) {
this.to = to;
}
public String getValFor76Tag() { public String getValFor76Tag() {
return valFor76Tag; return valFor76Tag;
} }
@ -40,10 +44,6 @@ public class SWTHeaderData {
this.valFor77ATag = valFor77ATag; this.valFor77ATag = valFor77ATag;
} }
public void setTo(String to) {
this.to = to;
}
public String getFrom() { public String getFrom() {
return from; return from;
} }
@ -68,6 +68,10 @@ public class SWTHeaderData {
this.dateTime = dateTime; this.dateTime = dateTime;
} }
public void setDateTime(String dateTime) {
this.dateTime = LocalDateTime.from(dtInFileHeaderFormatter.parse(dateTime));
}
public String getValFor20Tag() { public String getValFor20Tag() {
return valFor20Tag; return valFor20Tag;
} }

21
clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java
View file

@ -32,13 +32,18 @@ S_DF_10
S_DF_13 S_DF_13
* */ * */
String line = scanner.nextLine(); String line = scanner.nextLine();
to = line.substring(line.lastIndexOf("To:")); to = line.substring(line.lastIndexOf("To:") + "To:".length());
line = scanner.nextLine(); line = scanner.nextLine();
from = line.substring(line.lastIndexOf("From:")); from = line.substring(line.lastIndexOf("From:") + "From:".length());
line = scanner.nextLine(); line = scanner.nextLine();
type = line.substring(line.lastIndexOf("Type:")); type = line.substring(line.lastIndexOf("Type:") + "Type:".length());
line = scanner.nextLine(); 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()) { switch (resultContainer.getSwtTable()) {
case S_DF_08: { case S_DF_08: {
String val20, val21, val18A; String val20, val21, val18A;
@ -48,11 +53,11 @@ S_DF_13
:18A:46 :18A:46
* */ * */
line = scanner.nextLine(); line = scanner.nextLine();
val20 = line.substring(line.lastIndexOf(":20:")); val20 = line.substring(line.lastIndexOf(":20:") + ":20:".length());
line = scanner.nextLine(); line = scanner.nextLine();
val21 = line.substring(line.lastIndexOf(":21:")); val21 = line.substring(line.lastIndexOf(":21:") + ":21:".length());
line = scanner.nextLine(); line = scanner.nextLine();
val18A = line.substring(line.lastIndexOf(":18A:")); val18A = line.substring(line.lastIndexOf(":18A:") + ":18A:".length());
swtHeaderData.setValFor20Tag(val20); swtHeaderData.setValFor20Tag(val20);
swtHeaderData.setValFor21Tag(val21); swtHeaderData.setValFor21Tag(val21);
swtHeaderData.setValFor18ATag(val18A); swtHeaderData.setValFor18ATag(val18A);
@ -64,7 +69,7 @@ S_DF_13
* */ * */
String val20; String val20;
line = scanner.nextLine(); line = scanner.nextLine();
val20 = line.substring(line.lastIndexOf(":20:")); val20 = line.substring(line.lastIndexOf(":20:") + ":20:".length());
swtHeaderData.setValFor20Tag(val20); swtHeaderData.setValFor20Tag(val20);
} }
break; break;