From 4e205f0f7484479e3f06aed6a33f66b925edd44a Mon Sep 17 00:00:00 2001 From: psemenkov Date: Wed, 3 Apr 2024 13:04:32 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-656=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=5Fdf07=20?= =?UTF-8?q?=D0=B8=20s=5Fdf54.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exporter/services/converters/S_DF07_Converter.java | 7 ++++++- .../exporter/services/converters/S_DF54_Converter.java | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java index 765bd53a6..a92b4f0af 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java @@ -5,7 +5,6 @@ import com.linuxense.javadbf.DBFField; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.sdf.SDf07; -import java.math.BigDecimal; import java.util.LinkedList; import java.util.List; @@ -25,6 +24,9 @@ public class S_DF07_Converter extends DFConverter { values.add(typeMatch(entity.getSpec())); values.add(typeMatch(entity.getNumber())); values.add(typeMatch(entity.getResult())); + values.add(typeMatch(entity.getDoc_Num())); + values.add(typeMatch(entity.getDoc_Date())); + values.add(typeMatch(entity.getPay_val())); return values.toArray(Object[]::new); } @@ -51,6 +53,9 @@ public class S_DF07_Converter extends DFConverter { dbfFields.add(new DBFField("SPEC", DBFDataType.CHARACTER, 254)); dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 10)); dbfFields.add(new DBFField("RESULT", DBFDataType.NUMERIC, 1)); + dbfFields.add(new DBFField("DOC_NUM", DBFDataType.CHARACTER, 3)); + dbfFields.add(new DBFField("DOC_DATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java index 796b57368..44f1947e1 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java @@ -54,6 +54,11 @@ public class S_DF54_Converter extends DFConverter { values.add(typeMatch(entity.getSpecif_1())); values.add(typeMatch(entity.getSend_type())); values.add(typeMatch(entity.getDoc_result())); + values.add(typeMatch(entity.getDoc_Num())); + values.add(typeMatch(entity.getDoc_Date())); + values.add(typeMatch(entity.getValue_date())); + values.add(typeMatch(entity.getSwift_ben())); + values.add(typeMatch(entity.getSwift_intermed())); return values.toArray(Object[]::new); } @@ -100,6 +105,11 @@ public class S_DF54_Converter extends DFConverter { dbfFields.add(new DBFField("SPECIF1", DBFDataType.CHARACTER, 254)); dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("DOC_NUM", DBFDataType.CHARACTER, 3)); + dbfFields.add(new DBFField("DOC_DATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("VALUE_DATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("SWIFT_BEN", DBFDataType.CHARACTER, 11)); + dbfFields.add(new DBFField("SWIFT_INT", DBFDataType.CHARACTER, 11)); return dbfFields.toArray(DBFField[]::new); }