From 4c9b70df5fdfe02cfc98ec8c2bcbae482480d1e7 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Sun, 5 May 2024 22:01:50 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-613#comment-59858 --- .../src/main/resources/meta/meta.json | 66 +++++++++---------- .../src/main/resources/meta/meta.xml | 34 +++++----- .../backend-api/src/test/resources/meta.json | 66 +++++++++---------- .../classes/statics/data/sdf/SDf06.java | 32 ++++----- .../classes/statics/data/sdf/SDf07.java | 32 ++++----- .../classes/statics/data/sdf/SDf54.java | 38 +++++------ .../classes/statics/data/sdf/SDf55.java | 38 +++++------ .../classes/statics/data/sdf/SDf57.java | 38 +++++------ .../service/executors/Sdf06Executor.java | 4 +- .../db-scripts/src/main/resources/db/DDL.sql | 48 +++++++------- .../src/main/resources/db/updateDDL_3.11.sql | 64 +++++++++--------- .../services/converters/S_DF07_Converter.java | 4 +- .../services/converters/S_DF54_Converter.java | 4 +- .../logic/data/tables/SDf06Table.java | 4 +- .../logic/data/tables/SDf55Table.java | 4 +- .../logic/data/tables/SDf57Table.java | 4 +- .../clearing/imdg/object/SDf06MapStore.java | 10 +-- .../clearing/imdg/object/SDf07MapStore.java | 10 +-- .../clearing/imdg/object/SDf54MapStore.java | 16 ++--- .../clearing/imdg/object/SDf55MapStore.java | 16 ++--- .../clearing/imdg/object/SDf57MapStore.java | 10 +-- 21 files changed, 272 insertions(+), 270 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index 03c6f56b7..72d12b78f 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.11.0.86", + "version": "3.11.0.87", "enums": { @@ -8463,12 +8463,12 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -8553,12 +8553,12 @@ "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -9427,24 +9427,24 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Value_date", - "field": "Value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true + {"code": "value_date", + "field": "value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_ben", - "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true + {"code": "swift_ben", + "field": "swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_int", - "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true + {"code": "swift_int", + "field": "swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] @@ -9637,24 +9637,24 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Value_date", - "field": "Value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true + {"code": "value_date", + "field": "value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_ben", - "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true + {"code": "swift_ben", + "field": "swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_int", - "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true + {"code": "swift_int", + "field": "swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] @@ -9881,12 +9881,12 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "dt_in", diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 5923015e0..b5e20088a 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -1952,8 +1952,8 @@ - - + + @@ -1973,8 +1973,8 @@ - - + + @@ -2172,11 +2172,11 @@ - - - - - + + + + + @@ -2223,11 +2223,11 @@ - - - - - + + + + + @@ -2281,8 +2281,8 @@ - - + + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 03c6f56b7..72d12b78f 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.11.0.86", + "version": "3.11.0.87", "enums": { @@ -8463,12 +8463,12 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -8553,12 +8553,12 @@ "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -9427,24 +9427,24 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Value_date", - "field": "Value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true + {"code": "value_date", + "field": "value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_ben", - "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true + {"code": "swift_ben", + "field": "swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_int", - "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true + {"code": "swift_int", + "field": "swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] @@ -9637,24 +9637,24 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Value_date", - "field": "Value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true + {"code": "value_date", + "field": "value_date","type": 2,"length": 8,"name": "Дата валютирования","shortname": "Дата валютирования","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_ben", - "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true + {"code": "swift_ben", + "field": "swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_int", - "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true + {"code": "swift_int", + "field": "swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] @@ -9881,12 +9881,12 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Num", - "field": "Doc_Num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_num", + "field": "doc_num","type": 2,"length": 3,"name": "Номер выгружаемого документа","shortname": "Номер выгружаемого документа","searchable": true,"sortable": true,"visible": true } , - {"code": "Doc_Date", - "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + {"code": "doc_date", + "field": "doc_date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "dt_in", diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java index a3549a408..e9b6486f2 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java @@ -28,8 +28,8 @@ public class SDf06 extends SpcexObjectBase implements WithFileName, WithCurrency private String fileName; private Instant generationTime; private Long generationId; - private String Doc_Num; - private String Doc_Date; + private String doc_num; + private String doc_date; private String pay_val; public String getAccount() { @@ -84,16 +84,16 @@ public class SDf06 extends SpcexObjectBase implements WithFileName, WithCurrency return inn; } - public void setInn(String inn) { - this.inn = inn; + public void setInn(String value) { + this.inn = value; } public String getBic() { return bic; } - public void setBic(String bic) { - this.bic = bic; + public void setBic(String value) { + this.bic = value; } public String getSpec() { @@ -136,18 +136,20 @@ public class SDf06 extends SpcexObjectBase implements WithFileName, WithCurrency this.generationId = value; } - public String getDoc_Num() { - return Doc_Num; - } - public void setDoc_Num(String value) { - this.Doc_Num=value; + public String getDoc_num() { + return doc_num; } - public String getDoc_Date() { - return Doc_Date; + public void setDoc_num(String value) { + this.doc_num = value; } - public void setDoc_Date(String value) { - this.Doc_Date=value; + + public String getDoc_date() { + return doc_date; + } + + public void setDoc_date(String value) { + this.doc_date = value; } public String getPay_val() { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java index 83bca6896..23a7ebf55 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java @@ -30,8 +30,8 @@ public class SDf07 extends SpcexObjectBase { private Instant generationTime; private Long generationId; private Long inSDfId; - private String Doc_Num; - private String Doc_Date; + private String doc_num; + private String doc_date; private String pay_val; public String getAccount() { @@ -86,16 +86,16 @@ public class SDf07 extends SpcexObjectBase { return inn; } - public void setInn(String inn) { - this.inn = inn; + public void setInn(String value) { + this.inn = value; } public String getBic() { return bic; } - public void setBic(String bic) { - this.bic = bic; + public void setBic(String value) { + this.bic = value; } public String getSpec() { @@ -126,8 +126,8 @@ public class SDf07 extends SpcexObjectBase { return fileName; } - public void setFileName(String fileName) { - this.fileName = fileName; + public void setFileName(String value) { + this.fileName = value; } public Instant getGenerationTime() { @@ -154,20 +154,20 @@ public class SDf07 extends SpcexObjectBase { this.inSDfId = value; } - public String getDoc_Num() { - return Doc_Num; + public String getDoc_num() { + return doc_num; } - public void setDoc_Num(String value) { - this.Doc_Num = value; + public void setDoc_num(String value) { + this.doc_num = value; } - public String getDoc_Date() { - return Doc_Date; + public String getDoc_date() { + return doc_date; } - public void setDoc_Date(String value) { - this.Doc_Date = value; + public void setDoc_date(String value) { + this.doc_date = value; } public String getPay_val() { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java index 96779e0c5..f8e5f287a 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java @@ -56,11 +56,11 @@ public class SDf54 extends SpcexObjectBase { private String doc_result; private Instant generationTime; private Long generationId; - private String Doc_Num; - private String Doc_Date; - private String Value_date; - private String Swift_ben; - private String Swift_int; + private String doc_num; + private String doc_date; + private String value_date; + private String swift_ben; + private String swift_int; public String getSeg_type() { return seg_type; @@ -398,44 +398,44 @@ public class SDf54 extends SpcexObjectBase { this.generationId = value; } - public String getDoc_Num() { - return Doc_Num; + public String getDoc_num() { + return doc_num; } - public void setDoc_Num(String value) { - this.Doc_Num = value; + public void setDoc_num(String value) { + this.doc_num = value; } - public String getDoc_Date() { - return Doc_Date; + public String getDoc_date() { + return doc_date; } - public void setDoc_Date(String value) { - this.Doc_Date = value; + public void setDoc_date(String value) { + this.doc_date = value; } public String getValue_date() { - return Value_date; + return value_date; } public void setValue_date(String value) { - this.Value_date = value; + this.value_date = value; } public String getSwift_ben() { - return Swift_ben; + return swift_ben; } public void setSwift_ben(String value) { - this.Swift_ben = value; + this.swift_ben = value; } public String getSwift_int() { - return Swift_int; + return swift_int; } public void setSwift_int(String value) { - this.Swift_int = value; + this.swift_int = value; } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java index 999e5d434..e9bbbc102 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java @@ -57,11 +57,11 @@ public class SDf55 extends SpcexObjectBase { private String fileName; private Instant generationTime; private Long generationId; - private String Doc_Num; - private String Doc_Date; - private String Value_date; - private String Swift_ben; - private String Swift_int; + private String doc_num; + private String doc_date; + private String value_date; + private String swift_ben; + private String swift_int; public String getSeg_type() { return seg_type; @@ -407,44 +407,44 @@ public class SDf55 extends SpcexObjectBase { this.generationId = value; } - public String getDoc_Num() { - return Doc_Num; + public String getDoc_num() { + return doc_num; } - public void setDoc_Num(String value) { - this.Doc_Num = value; + public void setDoc_num(String value) { + this.doc_num = value; } - public String getDoc_Date() { - return Doc_Date; + public String getDoc_date() { + return doc_date; } - public void setDoc_Date(String value) { - this.Doc_Date = value; + public void setDoc_date(String value) { + this.doc_date = value; } public String getValue_date() { - return Value_date; + return value_date; } public void setValue_date(String value) { - this.Value_date = value; + this.value_date = value; } public String getSwift_ben() { - return Swift_ben; + return swift_ben; } public void setSwift_ben(String value) { - this.Swift_ben = value; + this.swift_ben = value; } public String getSwift_int() { - return Swift_int; + return swift_int; } public void setSwift_int(String value) { - this.Swift_int = value; + this.swift_int = value; } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf57.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf57.java index ca5627076..d655a517f 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf57.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf57.java @@ -13,6 +13,7 @@ import ru.spcex.platform.classes.base.SpcexObjectBase; public class SDf57 extends SpcexObjectBase implements WithCurrency { private static final long serialVersionUID = ConstSerializable.serialVersionUID; + private Instant generationTime; private Long dbfId; private String deal_deb; private String deal_cred; @@ -51,15 +52,22 @@ public class SDf57 extends SpcexObjectBase implements WithCurrency { private String acc_kr; private String specif; private String fileName; - private Instant generationTime; private Long generationId; - private String Doc_Num; - private String Doc_Date; + private String doc_num; + private String doc_date; private String dt_in; private String kt_in; private String dt_out; private String kt_out; + public Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant value) { + this.generationTime = value; + } + public Long getDbfId() { return dbfId; } @@ -364,14 +372,6 @@ public class SDf57 extends SpcexObjectBase implements WithCurrency { this.fileName = value; } - public Instant getGenerationTime() { - return generationTime; - } - - public void setGenerationTime(Instant value) { - this.generationTime = value; - } - public Long getGenerationId() { return generationId; } @@ -380,20 +380,20 @@ public class SDf57 extends SpcexObjectBase implements WithCurrency { this.generationId = value; } - public String getDoc_Num() { - return Doc_Num; + public String getDoc_num() { + return doc_num; } - public void setDoc_Num(String value) { - this.Doc_Num = value; + public void setDoc_num(String value) { + this.doc_num = value; } - public String getDoc_Date() { - return Doc_Date; + public String getDoc_date() { + return doc_date; } - public void setDoc_Date(String value) { - this.Doc_Date = value; + public void setDoc_date(String value) { + this.doc_date = value; } public String getDt_in() { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java index b55d17f6e..5c3aa2cf2 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java @@ -349,8 +349,8 @@ public class Sdf06Executor { sDf07.setNumber(sdf06.getNumber()); sDf07.setSpec(sdf06.getSpec()); sDf07.setResult(result); - sDf07.setDoc_Date(sdf06.getDoc_Date()); - sDf07.setDoc_Num(sdf06.getDoc_Num()); + sDf07.setDoc_date(sdf06.getDoc_date()); + sDf07.setDoc_num(sdf06.getDoc_num()); sDf07.setPay_val(sdf06.getPay_val()); return sDf07; } diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 3adac2e71..c57d57845 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -1,4 +1,4 @@ --- DB version: 3.11.0.83 +-- DB version: 3.11.0.87 /* Dictionaries */ -- allowed - Справочник признаков допустимости использования объектов @@ -4100,7 +4100,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF05 TO clearing; -- sDf06 - ДФ-06 Запрос на зачисление/списание денежных средств DROP TABLE IF EXISTS S_DF06; -CREATE TABLE S_DF06(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, _DOC__NUM varchar(3), _DOC__DATE varchar(8), PAY_VAL varchar(12)); +CREATE TABLE S_DF06(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), PAY_VAL varchar(12)); COMMENT ON TABLE S_DF06 IS 'ДФ-06 Запрос на зачисление/списание денежных средств'; COMMENT ON COLUMN S_DF06.ID IS 'Идентификатор записи'; @@ -4131,9 +4131,9 @@ COMMENT ON COLUMN S_DF06.GENERATION_TIME IS 'Дата и время обрабо COMMENT ON COLUMN S_DF06.GENERATION_ID IS 'Идентификатор взаимодействия'; -COMMENT ON COLUMN S_DF06._DOC__NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF06.DOC_NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF06._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF06.DOC_DATE IS 'Дата выгружаемого документа'; COMMENT ON COLUMN S_DF06.PAY_VAL IS 'Валюта документа'; @@ -4141,7 +4141,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF06 TO clearing; -- sDf07 - ДФ-07 Ответ на запрос по зачислению/списанию денежных средств DROP TABLE IF EXISTS S_DF07; -CREATE TABLE S_DF07(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint, _DOC__NUM varchar(3), _DOC__DATE varchar(8), PAY_VAL varchar(12)); +CREATE TABLE S_DF07(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), PAY_VAL varchar(12)); COMMENT ON TABLE S_DF07 IS 'ДФ-07 Ответ на запрос по зачислению/списанию денежных средств'; COMMENT ON COLUMN S_DF07.ID IS 'Идентификатор записи'; @@ -4176,9 +4176,9 @@ COMMENT ON COLUMN S_DF07.GENERATION_ID IS 'Идентификатор взаим COMMENT ON COLUMN S_DF07.IN_S_DF_ID IS 'Идентификатор соответствующей записи из таблицы-источника'; -COMMENT ON COLUMN S_DF07._DOC__NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF07.DOC_NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF07._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF07.DOC_DATE IS 'Дата выгружаемого документа'; COMMENT ON COLUMN S_DF07.PAY_VAL IS 'Валюта документа'; @@ -4526,7 +4526,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF53 TO clearing; -- sDf54 - ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414 DROP TABLE IF EXISTS S_DF54; -CREATE TABLE S_DF54(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint, _DOC__NUM varchar(3), _DOC__DATE varchar(8), _VALUE_DATE varchar(8), _SWIFT_BEN varchar(11), _SWIFT_INT varchar(11)); +CREATE TABLE S_DF54(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), VALUE_DATE varchar(8), SWIFT_BEN varchar(11), SWIFT_INT varchar(11)); COMMENT ON TABLE S_DF54 IS 'ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414'; COMMENT ON COLUMN S_DF54.ID IS 'Идентификатор записи'; @@ -4615,21 +4615,21 @@ COMMENT ON COLUMN S_DF54.GENERATION_TIME IS 'Дата и время создан COMMENT ON COLUMN S_DF54.GENERATION_ID IS 'Идентификатор взаимодействия'; -COMMENT ON COLUMN S_DF54._DOC__NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF54.DOC_NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF54._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF54.DOC_DATE IS 'Дата выгружаемого документа'; -COMMENT ON COLUMN S_DF54._VALUE_DATE IS 'Дата валютирования'; +COMMENT ON COLUMN S_DF54.VALUE_DATE IS 'Дата валютирования'; -COMMENT ON COLUMN S_DF54._SWIFT_BEN IS 'Свифт банка бенефициара'; +COMMENT ON COLUMN S_DF54.SWIFT_BEN IS 'Свифт банка бенефициара'; -COMMENT ON COLUMN S_DF54._SWIFT_INT IS 'Свифт банка посредника'; +COMMENT ON COLUMN S_DF54.SWIFT_INT IS 'Свифт банка посредника'; GRANT ALL PRIVILEGES ON TABLE S_DF54 TO clearing; -- sDf55 - ДФ-55 Квитанция об обработке ДФ-54 DROP TABLE IF EXISTS S_DF55; -CREATE TABLE S_DF55(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, _DOC__NUM varchar(3), _DOC__DATE varchar(8), _VALUE_DATE varchar(8), _SWIFT_BEN varchar(11), _SWIFT_INT varchar(11)); +CREATE TABLE S_DF55(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), VALUE_DATE varchar(8), SWIFT_BEN varchar(11), SWIFT_INT varchar(11)); COMMENT ON TABLE S_DF55 IS 'ДФ-55 Квитанция об обработке ДФ-54'; COMMENT ON COLUMN S_DF55.ID IS 'Идентификатор записи'; @@ -4720,15 +4720,15 @@ COMMENT ON COLUMN S_DF55.GENERATION_TIME IS 'Дата и время обрабо COMMENT ON COLUMN S_DF55.GENERATION_ID IS 'Идентификатор взаимодействия'; -COMMENT ON COLUMN S_DF55._DOC__NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF55.DOC_NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF55._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF55.DOC_DATE IS 'Дата выгружаемого документа'; -COMMENT ON COLUMN S_DF55._VALUE_DATE IS 'Дата валютирования'; +COMMENT ON COLUMN S_DF55.VALUE_DATE IS 'Дата валютирования'; -COMMENT ON COLUMN S_DF55._SWIFT_BEN IS 'Свифт банка бенефициара'; +COMMENT ON COLUMN S_DF55.SWIFT_BEN IS 'Свифт банка бенефициара'; -COMMENT ON COLUMN S_DF55._SWIFT_INT IS 'Свифт банка посредника'; +COMMENT ON COLUMN S_DF55.SWIFT_INT IS 'Свифт банка посредника'; GRANT ALL PRIVILEGES ON TABLE S_DF55 TO clearing; @@ -4757,7 +4757,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF56 TO clearing; -- sDf57 - ДФ-57 Список транзакций о списании/зачислении за период по всем счетам (ТБС и КС) DROP TABLE IF EXISTS S_DF57; -CREATE TABLE S_DF57(GENERATION_TIME timestamp, ID bigint PRIMARY KEY, DBF_ID bigint, DEAL_DEB varchar(4), DEAL_CRED varchar(4), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(35), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), PAY_DATE varchar(8), EXT_DATE varchar(255), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR varchar(35), SPECIF varchar(255), FILE_NAME varchar(255), GENERATION_ID bigint, _DOC__NUM varchar(3), _DOC__DATE varchar(8), DT_IN varchar(22), KT_IN varchar(22), DT_OUT varchar(22), KT_OUT varchar(22)); +CREATE TABLE S_DF57(GENERATION_TIME timestamp, ID bigint PRIMARY KEY, DBF_ID bigint, DEAL_DEB varchar(4), DEAL_CRED varchar(4), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(35), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), PAY_DATE varchar(8), EXT_DATE varchar(255), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR varchar(35), SPECIF varchar(255), FILE_NAME varchar(255), GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), DT_IN varchar(22), KT_IN varchar(22), DT_OUT varchar(22), KT_OUT varchar(22)); COMMENT ON TABLE S_DF57 IS 'ДФ-57 Список транзакций о списании/зачислении за период по всем счетам (ТБС и КС)'; COMMENT ON COLUMN S_DF57.GENERATION_TIME IS 'Дата и время создания записи'; @@ -4842,9 +4842,9 @@ COMMENT ON COLUMN S_DF57.FILE_NAME IS 'Наименование входящег COMMENT ON COLUMN S_DF57.GENERATION_ID IS 'Идентификатор взаимодействия'; -COMMENT ON COLUMN S_DF57._DOC__NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF57.DOC_NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF57._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF57.DOC_DATE IS 'Дата выгружаемого документа'; COMMENT ON COLUMN S_DF57.DT_IN IS 'Входящий дебетовый остаток'; @@ -5094,8 +5094,8 @@ COMMENT ON COLUMN S_CROSS_RATE.UPDATED_AT IS 'Дата-время изменен GRANT ALL PRIVILEGES ON TABLE S_CROSS_RATE TO clearing; - /* views */ +/* views */ - -- Data types +-- Data types INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.11') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION \ No newline at end of file diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql index 53ce9c8c4..4f012b5b5 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql @@ -268,53 +268,53 @@ ALTER TABLE DEPO_BALANCE_REGISTER ADD COLUMN IF NOT EXISTS NUMBER varchar(255); COMMENT ON COLUMN DEPO_BALANCE_REGISTER.SET_HOUSE_NAME IS 'Наименование РД'; COMMENT ON COLUMN DEPO_BALANCE_REGISTER.NUMBER IS 'Номер отчета'; -ALTER TABLE S_DF06 ADD COLUMN IF NOT EXISTS _DOC__NUM varchar(3); -ALTER TABLE S_DF06 ADD COLUMN IF NOT EXISTS _DOC__DATE varchar(8); +ALTER TABLE S_DF06 ADD COLUMN IF NOT EXISTS DOC_NUM varchar(3); +ALTER TABLE S_DF06 ADD COLUMN IF NOT EXISTS DOC_DATE varchar(8); ALTER TABLE S_DF06 ADD COLUMN IF NOT EXISTS PAY_VAL varchar(12); -COMMENT ON COLUMN S_DF06._DOC__NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF06._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF06.DOC_NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF06.DOC_DATE IS 'Дата выгружаемого документа'; COMMENT ON COLUMN S_DF06.PAY_VAL IS 'Валюта документа'; -ALTER TABLE S_DF07 ADD COLUMN IF NOT EXISTS _DOC__NUM varchar(3); -ALTER TABLE S_DF07 ADD COLUMN IF NOT EXISTS _DOC__DATE varchar(8); +ALTER TABLE S_DF07 ADD COLUMN IF NOT EXISTS DOC_NUM varchar(3); +ALTER TABLE S_DF07 ADD COLUMN IF NOT EXISTS DOC_DATE varchar(8); ALTER TABLE S_DF07 ADD COLUMN IF NOT EXISTS PAY_VAL varchar(12); -COMMENT ON COLUMN S_DF07._DOC__NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF07._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF07.DOC_NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF07.DOC_DATE IS 'Дата выгружаемого документа'; COMMENT ON COLUMN S_DF07.PAY_VAL IS 'Валюта документа'; ALTER TABLE S_DF52 ADD COLUMN IF NOT EXISTS ACC_TYPE varchar(3); COMMENT ON COLUMN S_DF52.ACC_TYPE IS 'Признак счета'; -ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS _DOC__NUM varchar(3); -ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS _DOC__DATE varchar(8); -ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS _VALUE_DATE varchar(8); -ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS _SWIFT_BEN varchar(11); -ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS _SWIFT_INT varchar(11); -COMMENT ON COLUMN S_DF54._DOC__NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF54._DOC__DATE IS 'Дата выгружаемого документа'; -COMMENT ON COLUMN S_DF54._VALUE_DATE IS 'Дата валютирования'; -COMMENT ON COLUMN S_DF54._SWIFT_BEN IS 'Свифт банка бенефициара'; -COMMENT ON COLUMN S_DF54._SWIFT_INT IS 'Свифт банка посредника'; +ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS DOC_NUM varchar(3); +ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS DOC_DATE varchar(8); +ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS VALUE_DATE varchar(8); +ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS SWIFT_BEN varchar(11); +ALTER TABLE S_DF54 ADD COLUMN IF NOT EXISTS SWIFT_INT varchar(11); +COMMENT ON COLUMN S_DF54.DOC_NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF54.DOC_DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF54.VALUE_DATE IS 'Дата валютирования'; +COMMENT ON COLUMN S_DF54.SWIFT_BEN IS 'Свифт банка бенефициара'; +COMMENT ON COLUMN S_DF54.SWIFT_INT IS 'Свифт банка посредника'; -ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS _DOC__NUM varchar(3); -ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS _DOC__DATE varchar(8); -ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS _VALUE_DATE varchar(8); -ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS _SWIFT_BEN varchar(11); -ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS _SWIFT_INT varchar(11); -COMMENT ON COLUMN S_DF55._DOC__NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF55._DOC__DATE IS 'Дата выгружаемого документа'; -COMMENT ON COLUMN S_DF55._VALUE_DATE IS 'Дата валютирования'; -COMMENT ON COLUMN S_DF55._SWIFT_BEN IS 'Свифт банка бенефициара'; -COMMENT ON COLUMN S_DF55._SWIFT_INT IS 'Свифт банка посредника'; +ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS DOC_NUM varchar(3); +ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS DOC_DATE varchar(8); +ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS VALUE_DATE varchar(8); +ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS SWIFT_BEN varchar(11); +ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS SWIFT_INT varchar(11); +COMMENT ON COLUMN S_DF55.DOC_NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF55.DOC_DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF55.VALUE_DATE IS 'Дата валютирования'; +COMMENT ON COLUMN S_DF55.SWIFT_BEN IS 'Свифт банка бенефициара'; +COMMENT ON COLUMN S_DF55.SWIFT_INT IS 'Свифт банка посредника'; -ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS _DOC__NUM varchar(3); -ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS _DOC__DATE varchar(8); +ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS DOC_NUM varchar(3); +ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS DOC_DATE varchar(8); ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS DT_IN varchar(22); ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS KT_IN varchar(22); ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS DT_OUT varchar(22); ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS KT_OUT varchar(22); -COMMENT ON COLUMN S_DF57._DOC__NUM IS 'Номер выгружаемого документа'; -COMMENT ON COLUMN S_DF57._DOC__DATE IS 'Дата выгружаемого документа'; +COMMENT ON COLUMN S_DF57.DOC_NUM IS 'Номер выгружаемого документа'; +COMMENT ON COLUMN S_DF57.DOC_DATE IS 'Дата выгружаемого документа'; COMMENT ON COLUMN S_DF57.DT_IN IS 'Входящий дебетовый остаток'; COMMENT ON COLUMN S_DF57.KT_IN IS 'Входящий кредитовый остаток'; COMMENT ON COLUMN S_DF57.DT_OUT IS 'Исходящий дебетовый остаток'; 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 6b4401b50..ed9749564 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 @@ -28,8 +28,8 @@ 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.getDoc_num())); + values.add(typeMatch(entity.getDoc_date())); values.add(typeMatch(entity.getPay_val())); return values.toArray(Object[]::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 1fbfc8a1b..ffd17ede1 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 @@ -58,8 +58,8 @@ 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.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_int())); 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 706394403..7f2e53cee 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 @@ -29,8 +29,8 @@ 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.setDoc_num((String) entity[10]); + result.setDoc_date((String) entity[11]); result.setPay_val((String) entity[12]); result.setFileName(filename); result.setGenerationTime(Instant.now()); 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 3852f3764..6c9f425b2 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,8 +59,8 @@ 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.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_int((String) entity[44]); 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 bb3d34b62..f2ce982fa 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,8 +70,8 @@ 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.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]); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf06MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf06MapStore.java index ae486edd7..6fb56f919 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf06MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf06MapStore.java @@ -34,7 +34,7 @@ public class SDf06MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "DEAL", "CLIENT_N", "INN", "BIC", "SPEC", "NUMBER", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "_DOC__NUM", "_DOC__DATE", "PAY_VAL" + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "DEAL", "CLIENT_N", "INN", "BIC", "SPEC", "NUMBER", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "DOC_NUM", "DOC_DATE", "PAY_VAL" }; } @@ -70,8 +70,8 @@ public class SDf06MapStore extends TemplateMapStore { object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setDoc_Num(resultSet.getObject("_DOC__NUM", String.class)); - object.setDoc_Date(resultSet.getObject("_DOC__DATE", String.class)); + object.setDoc_num(resultSet.getObject("DOC_NUM", String.class)); + object.setDoc_date(resultSet.getObject("DOC_DATE", String.class)); object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); return object; } @@ -93,8 +93,8 @@ public class SDf06MapStore extends TemplateMapStore { object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getDoc_Num(), - object.getDoc_Date(), + object.getDoc_num(), + object.getDoc_date(), object.getPay_val() }; return args; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java index c90c4c6af..6f0ed55a8 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java @@ -35,7 +35,7 @@ public class SDf07MapStore extends TemplateMapStore { public String[] getFields() { return new String[]{ "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "DEAL", "CLIENT_N", "INN", "BIC", "SPEC", "NUMBER", "RESULT", - "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID", "_DOC__NUM", "_DOC__DATE", "PAY_VAL" + "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID", "DOC_NUM", "DOC_DATE", "PAY_VAL" }; } @@ -73,8 +73,8 @@ public class SDf07MapStore extends TemplateMapStore { object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); - object.setDoc_Num(resultSet.getObject("_DOC__NUM", String.class)); - object.setDoc_Date(resultSet.getObject("_DOC__DATE", String.class)); + object.setDoc_num(resultSet.getObject("DOC_NUM", String.class)); + object.setDoc_date(resultSet.getObject("DOC_DATE", String.class)); object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); return object; } @@ -98,8 +98,8 @@ public class SDf07MapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), object.getInSDfId(), - object.getDoc_Num(), - object.getDoc_Date(), + object.getDoc_num(), + object.getDoc_date(), object.getPay_val() }; return args; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java index f5a917171..300e11166 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java @@ -33,7 +33,7 @@ public class SDf54MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "OP_TYPE", "OP_ORDER", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", "SCLIENTN3", "SCLIENTN4", "INN_DEB", "KPP_DEB", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR_1", "SPECIF_1", "SEND_TYPE", "DOC_RESULT", "GENERATION_TIME", "GENERATION_ID", "_DOC__NUM", "_DOC__DATE", "_VALUE_DATE", "_SWIFT_BEN", "_SWIFT_INT" + "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "OP_TYPE", "OP_ORDER", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", "SCLIENTN3", "SCLIENTN4", "INN_DEB", "KPP_DEB", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR_1", "SPECIF_1", "SEND_TYPE", "DOC_RESULT", "GENERATION_TIME", "GENERATION_ID", "DOC_NUM", "DOC_DATE", "VALUE_DATE", "SWIFT_BEN", "SWIFT_INT" }; } @@ -98,11 +98,11 @@ public class SDf54MapStore extends TemplateMapStore { object.setDoc_result(resultSet.getObject("DOC_RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setDoc_Num(resultSet.getObject("_DOC__NUM", String.class)); - object.setDoc_Date(resultSet.getObject("_DOC__DATE", String.class)); - object.setValue_date(resultSet.getObject("_VALUE_DATE", String.class)); - object.setSwift_ben(resultSet.getObject("_SWIFT_BEN", String.class)); - object.setSwift_int(resultSet.getObject("_SWIFT_INT", String.class)); + object.setDoc_num(resultSet.getObject("DOC_NUM", String.class)); + object.setDoc_date(resultSet.getObject("DOC_DATE", String.class)); + object.setValue_date(resultSet.getObject("VALUE_DATE", String.class)); + object.setSwift_ben(resultSet.getObject("SWIFT_BEN", String.class)); + object.setSwift_int(resultSet.getObject("SWIFT_INT", String.class)); return object; } @@ -152,8 +152,8 @@ public class SDf54MapStore extends TemplateMapStore { object.getDoc_result(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getDoc_Num(), - object.getDoc_Date(), + object.getDoc_num(), + object.getDoc_date(), object.getValue_date(), object.getSwift_ben(), object.getSwift_int() diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java index c7ab16f4a..cf27999c8 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java @@ -40,7 +40,7 @@ public class SDf55MapStore extends TemplateMapStore { "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR_1", "SPECIF_1", "SEND_TYPE", "DOC_RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", - "_DOC__NUM", "_DOC__DATE", "_VALUE_DATE", "_SWIFT_BEN", "_SWIFT_INT" + "DOC_NUM", "DOC_DATE", "VALUE_DATE", "SWIFT_BEN", "SWIFT_INT" }; } @@ -106,11 +106,11 @@ public class SDf55MapStore extends TemplateMapStore { object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setDoc_Num(resultSet.getObject("_DOC__NUM", String.class)); - object.setDoc_Date(resultSet.getObject("_DOC__DATE", String.class)); - object.setValue_date(resultSet.getObject("_VALUE_DATE", String.class)); - object.setSwift_ben(resultSet.getObject("_SWIFT_BEN", String.class)); - object.setSwift_int(resultSet.getObject("_SWIFT_INT", String.class)); + object.setDoc_num(resultSet.getObject("DOC_NUM", String.class)); + object.setDoc_date(resultSet.getObject("DOC_DATE", String.class)); + object.setValue_date(resultSet.getObject("VALUE_DATE", String.class)); + object.setSwift_ben(resultSet.getObject("SWIFT_BEN", String.class)); + object.setSwift_int(resultSet.getObject("SWIFT_INT", String.class)); return object; } @@ -161,8 +161,8 @@ public class SDf55MapStore extends TemplateMapStore { object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getDoc_Num(), - object.getDoc_Date(), + object.getDoc_num(), + object.getDoc_date(), object.getValue_date(), object.getSwift_ben(), object.getSwift_int() diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf57MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf57MapStore.java index 1b62b8cee..cd96df6f0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf57MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf57MapStore.java @@ -32,7 +32,7 @@ public class SDf57MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "GENERATION_TIME", "ID", "DBF_ID", "DEAL_DEB", "DEAL_CRED", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "OP_TYPE", "PAY_DATE", "EXT_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", "SCLIENTN3", "SCLIENTN4", "INN_DEB", "KPP_DEB", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR", "SPECIF", "FILE_NAME", "GENERATION_ID", "_DOC__NUM", "_DOC__DATE", "DT_IN", "KT_IN", "DT_OUT", "KT_OUT" + "GENERATION_TIME", "ID", "DBF_ID", "DEAL_DEB", "DEAL_CRED", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "OP_TYPE", "PAY_DATE", "EXT_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", "SCLIENTN3", "SCLIENTN4", "INN_DEB", "KPP_DEB", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR", "SPECIF", "FILE_NAME", "GENERATION_ID", "DOC_NUM", "DOC_DATE", "DT_IN", "KT_IN", "DT_OUT", "KT_OUT" }; } @@ -94,8 +94,8 @@ public class SDf57MapStore extends TemplateMapStore { object.setSpecif(resultSet.getObject("SPECIF", String.class)); object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setDoc_Num(resultSet.getObject("_DOC__NUM", String.class)); - object.setDoc_Date(resultSet.getObject("_DOC__DATE", String.class)); + object.setDoc_num(resultSet.getObject("DOC_NUM", String.class)); + object.setDoc_date(resultSet.getObject("DOC_DATE", String.class)); object.setDt_in(resultSet.getObject("DT_IN", String.class)); object.setKt_in(resultSet.getObject("KT_IN", String.class)); object.setDt_out(resultSet.getObject("DT_OUT", String.class)); @@ -147,8 +147,8 @@ public class SDf57MapStore extends TemplateMapStore { object.getSpecif(), object.getFileName(), object.getGenerationId(), - object.getDoc_Num(), - object.getDoc_Date(), + object.getDoc_num(), + object.getDoc_date(), object.getDt_in(), object.getKt_in(), object.getDt_out(),