From a8481d0e9ec6fff0e765bf876b27c88ec673af0a Mon Sep 17 00:00:00 2001 From: psemenkov Date: Mon, 8 Apr 2024 12:26:01 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-655=20?= =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D0=B0=D0=BB=D1=8F=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20s=5Fdf06,=20?= =?UTF-8?q?s=5Fdf55=20=D0=B8=20s=5Fdf57.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/dbf/importer/logic/data/tables/SDf06Table.java | 4 +++- .../clearing/dbf/importer/logic/data/tables/SDf55Table.java | 5 +++++ .../clearing/dbf/importer/logic/data/tables/SDf57Table.java | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf06Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf06Table.java index d737696d7..706394403 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf06Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf06Table.java @@ -4,7 +4,6 @@ import ru.clearing.classes.statics.data.sdf.SDf06; import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import java.math.BigDecimal; import java.time.Instant; public class SDf06Table extends AbstractTable { @@ -30,6 +29,9 @@ public class SDf06Table extends AbstractTable { result.setBic(anyToString(entity[7])); result.setSpec((String) entity[8]); result.setNumber(anyNumberToBigDecimal(entity[9])); + result.setDoc_Num((String) entity[10]); + result.setDoc_Date((String) entity[11]); + result.setPay_val((String) entity[12]); result.setFileName(filename); result.setGenerationTime(Instant.now()); result.setGenerationId(fileId); diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java index d1e11037b..49751ed64 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java @@ -59,6 +59,11 @@ public class SDf55Table extends AbstractTable { result.setSpecif_1((String) entity[37]); result.setSend_type((String) entity[38]); result.setDoc_result((String) entity[39]); + result.setDoc_Num((String) entity[40]); + result.setDoc_Date((String) entity[41]); + result.setValue_date((String) entity[42]); + result.setSwift_ben((String) entity[43]); + result.setSwift_intermed((String) entity[44]); result.setFileName(filename); result.setGenerationTime(Instant.now()); result.setGenerationId(fileId); diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf57Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf57Table.java index 30d75f562..bb3d34b62 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf57Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf57Table.java @@ -70,6 +70,12 @@ public class SDf57Table extends AbstractTable { result.setKpp_cred((String) entity[34]); result.setAcc_kr((String) entity[35]); result.setSpecif((String) entity[36]); + result.setDoc_Num((String) entity[37]); + result.setDoc_Date((String) entity[38]); + result.setDt_in((String) entity[39]); + result.setKt_in((String) entity[40]); + result.setDt_out((String) entity[41]); + result.setKt_out((String) entity[42]); result.setFileName(filename); result.setGenerationTime(Instant.now()); result.setGenerationId(fileId);