From 576eaaee9f350ebef15038cc28ac43840dae25f8 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 2 Apr 2024 15:33:57 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-613=20DDL?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=20=D0=BF=D0=BE=D0=BB=D1=8F=20Doc=5FDate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend-api/src/main/resources/meta/meta.json | 12 ++++++------ .../backend-api/src/main/resources/meta/meta.xml | 12 ++++++------ .../backend-api/src/test/resources/meta.json | 12 ++++++------ .../ru/clearing/classes/statics/data/sdf/SDf06.java | 6 +++--- .../ru/clearing/classes/statics/data/sdf/SDf07.java | 6 +++--- .../ru/clearing/classes/statics/data/sdf/SDf54.java | 6 +++--- .../ru/clearing/classes/statics/data/sdf/SDf55.java | 6 +++--- .../ru/clearing/classes/statics/data/sdf/SDf57.java | 6 +++--- .../db-scripts/src/main/resources/db/DDL.sql | 12 ++++++------ .../src/main/resources/db/updateDDL_3.11.sql | 10 +++++----- .../ru/spcex/clearing/imdg/object/SDf06MapStore.java | 4 ++-- .../ru/spcex/clearing/imdg/object/SDf07MapStore.java | 4 ++-- .../ru/spcex/clearing/imdg/object/SDf54MapStore.java | 4 ++-- .../ru/spcex/clearing/imdg/object/SDf55MapStore.java | 4 ++-- .../ru/spcex/clearing/imdg/object/SDf57MapStore.java | 4 ++-- 15 files changed, 54 insertions(+), 54 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 979845924..c86038ba3 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.79", + "version": "3.11.0.80", "enums": { @@ -8518,7 +8518,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -8608,7 +8608,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -9478,7 +9478,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "Value_date", @@ -9688,7 +9688,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "Value_date", @@ -9932,7 +9932,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "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 6db977154..fb6afb97d 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 @@ - + @@ -1966,7 +1966,7 @@ - + @@ -1987,7 +1987,7 @@ - + @@ -2185,7 +2185,7 @@ - + @@ -2236,7 +2236,7 @@ - + @@ -2294,7 +2294,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 979845924..c86038ba3 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.79", + "version": "3.11.0.80", "enums": { @@ -8518,7 +8518,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -8608,7 +8608,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "pay_val", @@ -9478,7 +9478,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "Value_date", @@ -9688,7 +9688,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "field": "Doc_Date","type": 2,"length": 8,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true } , {"code": "Value_date", @@ -9932,7 +9932,7 @@ } , {"code": "Doc_Date", - "field": "Doc_Date","type": 6,"name": "Дата выгружаемого документа","shortname": "Дата выгружаемого документа","searchable": true,"sortable": true,"visible": true + "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 e96043ce8..1f50cb88a 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 @@ -30,7 +30,7 @@ public class SDf06 extends SpcexObjectBase implements WithFileName { private Instant generationTime; private Long generationId; private String Doc_Num; - private LocalDate Doc_Date; + private String Doc_Date; private String pay_val; public String getAccount() { @@ -144,10 +144,10 @@ public class SDf06 extends SpcexObjectBase implements WithFileName { this.Doc_Num=value; } - public LocalDate getDoc_Date() { + public String getDoc_Date() { return Doc_Date; } - public void setDoc_Date(LocalDate value) { + public void setDoc_Date(String value) { this.Doc_Date=value; } 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 31fecc229..83bca6896 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 @@ -31,7 +31,7 @@ public class SDf07 extends SpcexObjectBase { private Long generationId; private Long inSDfId; private String Doc_Num; - private LocalDate Doc_Date; + private String Doc_Date; private String pay_val; public String getAccount() { @@ -162,11 +162,11 @@ public class SDf07 extends SpcexObjectBase { this.Doc_Num = value; } - public LocalDate getDoc_Date() { + public String getDoc_Date() { return Doc_Date; } - public void setDoc_Date(LocalDate value) { + public void setDoc_Date(String value) { this.Doc_Date = value; } 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 ffdc95f97..0250b8dc0 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 @@ -57,7 +57,7 @@ public class SDf54 extends SpcexObjectBase { private Instant generationTime; private Long generationId; private String Doc_Num; - private LocalDate Doc_Date; + private String Doc_Date; private String Value_date; private String Swift_ben; private String Swift_intermed; @@ -406,11 +406,11 @@ public class SDf54 extends SpcexObjectBase { this.Doc_Num = value; } - public LocalDate getDoc_Date() { + public String getDoc_Date() { return Doc_Date; } - public void setDoc_Date(LocalDate value) { + public void setDoc_Date(String value) { this.Doc_Date = value; } 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 a01492f66..5cd31e713 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 @@ -58,7 +58,7 @@ public class SDf55 extends SpcexObjectBase { private Instant generationTime; private Long generationId; private String Doc_Num; - private LocalDate Doc_Date; + private String Doc_Date; private String Value_date; private String Swift_ben; private String Swift_intermed; @@ -415,11 +415,11 @@ public class SDf55 extends SpcexObjectBase { this.Doc_Num = value; } - public LocalDate getDoc_Date() { + public String getDoc_Date() { return Doc_Date; } - public void setDoc_Date(LocalDate value) { + public void setDoc_Date(String value) { this.Doc_Date = value; } 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 56991365b..1ef4c839c 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 @@ -55,7 +55,7 @@ public class SDf57 extends SpcexObjectBase { private Instant generationTime; private Long generationId; private String Doc_Num; - private LocalDate Doc_Date; + private String Doc_Date; private String dt_in; private String kt_in; private String dt_out; @@ -389,11 +389,11 @@ public class SDf57 extends SpcexObjectBase { this.Doc_Num = value; } - public LocalDate getDoc_Date() { + public String getDoc_Date() { return Doc_Date; } - public void setDoc_Date(LocalDate value) { + public void setDoc_Date(String value) { this.Doc_Date = value; } 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 1ccd91085..e017a0816 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.78 +-- DB version: 3.11.0.80 /* Dictionaries */ -- allowed - Справочник признаков допустимости использования объектов @@ -4104,7 +4104,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 date, 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 'Идентификатор записи'; @@ -4145,7 +4145,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 date, 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 'Идентификатор записи'; @@ -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 date, _VALUE_DATE varchar(8), _SWIFT_BEN varchar(11), _SWIFT_INTERMED 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_INTERMED varchar(11)); COMMENT ON TABLE S_DF54 IS 'ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414'; COMMENT ON COLUMN S_DF54.ID IS 'Идентификатор записи'; @@ -4629,7 +4629,7 @@ 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 date, _VALUE_DATE varchar(8), _SWIFT_BEN varchar(11), _SWIFT_INTERMED 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_INTERMED varchar(11)); COMMENT ON TABLE S_DF55 IS 'ДФ-55 Квитанция об обработке ДФ-54'; COMMENT ON COLUMN S_DF55.ID IS 'Идентификатор записи'; @@ -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 date, 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 'Дата и время создания записи'; 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 12ca0afd4..72e6eba45 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 @@ -271,21 +271,21 @@ 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 date; +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.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 date; +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.PAY_VAL 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 date; +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_INTERMED varchar(11); @@ -296,7 +296,7 @@ COMMENT ON COLUMN S_DF54._SWIFT_BEN IS 'Свифт банка бенефициа COMMENT ON COLUMN S_DF54._SWIFT_INTERMED IS 'Swift_intermed'; ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS _DOC__NUM varchar(3); -ALTER TABLE S_DF55 ADD COLUMN IF NOT EXISTS _DOC__DATE date; +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_INTERMED varchar(11); @@ -307,7 +307,7 @@ COMMENT ON COLUMN S_DF55._SWIFT_BEN IS 'Свифт банка бенефициа COMMENT ON COLUMN S_DF55._SWIFT_INTERMED IS 'Swift_intermed'; ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS _DOC__NUM varchar(3); -ALTER TABLE S_DF57 ADD COLUMN IF NOT EXISTS _DOC__DATE date; +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); 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 a8acf74bc..ae486edd7 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 @@ -71,7 +71,7 @@ public class SDf06MapStore extends TemplateMapStore { 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(getLocalDateFromSqlDate(resultSet, "_DOC__DATE")); + object.setDoc_Date(resultSet.getObject("_DOC__DATE", String.class)); object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); return object; } @@ -94,7 +94,7 @@ public class SDf06MapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), object.getDoc_Num(), - TimeUtil.toDateFromLocalDate(object.getDoc_Date()), + 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 a974e196a..c90c4c6af 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 @@ -74,7 +74,7 @@ public class SDf07MapStore extends TemplateMapStore { 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(getLocalDateFromSqlDate(resultSet, "_DOC__DATE")); + object.setDoc_Date(resultSet.getObject("_DOC__DATE", String.class)); object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); return object; } @@ -99,7 +99,7 @@ public class SDf07MapStore extends TemplateMapStore { object.getGenerationId(), object.getInSDfId(), object.getDoc_Num(), - TimeUtil.toDateFromLocalDate(object.getDoc_Date()), + 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 a74583066..2934ed3de 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 @@ -99,7 +99,7 @@ public class SDf54MapStore extends TemplateMapStore { 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(getLocalDateFromSqlDate(resultSet, "_DOC__DATE")); + 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_intermed(resultSet.getObject("_SWIFT_INTERMED", String.class)); @@ -153,7 +153,7 @@ public class SDf54MapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), object.getDoc_Num(), - TimeUtil.toDateFromLocalDate(object.getDoc_Date()), + object.getDoc_Date(), object.getValue_date(), object.getSwift_ben(), object.getSwift_intermed() 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 f6d9b9a1d..f13590e26 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 @@ -107,7 +107,7 @@ public class SDf55MapStore extends TemplateMapStore { 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(getLocalDateFromSqlDate(resultSet, "_DOC__DATE")); + 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_intermed(resultSet.getObject("_SWIFT_INTERMED", String.class)); @@ -162,7 +162,7 @@ public class SDf55MapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), object.getDoc_Num(), - TimeUtil.toDateFromLocalDate(object.getDoc_Date()), + object.getDoc_Date(), object.getValue_date(), object.getSwift_ben(), object.getSwift_intermed() 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 8d16a02a8..1b62b8cee 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 @@ -95,7 +95,7 @@ public class SDf57MapStore extends TemplateMapStore { 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(getLocalDateFromSqlDate(resultSet, "_DOC__DATE")); + 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)); @@ -148,7 +148,7 @@ public class SDf57MapStore extends TemplateMapStore { object.getFileName(), object.getGenerationId(), object.getDoc_Num(), - TimeUtil.toDateFromLocalDate(object.getDoc_Date()), + object.getDoc_Date(), object.getDt_in(), object.getKt_in(), object.getDt_out(),