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 c86038ba3..c282fded5 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -9489,8 +9489,8 @@ "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_intermed", - "field": "Swift_intermed","type": 2,"length": 11,"name": "Swift_intermed","shortname": "Swift_intermed","searchable": true,"sortable": true,"visible": true + {"code": "Swift_int", + "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] @@ -9699,8 +9699,8 @@ "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_intermed", - "field": "Swift_intermed","type": 2,"length": 11,"name": "Swift_intermed","shortname": "Swift_intermed","searchable": true,"sortable": true,"visible": true + {"code": "Swift_int", + "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] 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 fb6afb97d..50bb1af52 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -2188,7 +2188,7 @@ - + @@ -2239,7 +2239,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index c86038ba3..c282fded5 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -9489,8 +9489,8 @@ "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_intermed", - "field": "Swift_intermed","type": 2,"length": 11,"name": "Swift_intermed","shortname": "Swift_intermed","searchable": true,"sortable": true,"visible": true + {"code": "Swift_int", + "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] @@ -9699,8 +9699,8 @@ "field": "Swift_ben","type": 2,"length": 11,"name": "Свифт банка бенефициара","shortname": "Свифт банка бенефициара","searchable": true,"sortable": true,"visible": true } , - {"code": "Swift_intermed", - "field": "Swift_intermed","type": 2,"length": 11,"name": "Swift_intermed","shortname": "Swift_intermed","searchable": true,"sortable": true,"visible": true + {"code": "Swift_int", + "field": "Swift_int","type": 2,"length": 11,"name": "Свифт банка посредника","shortname": "Свифт банка посредника","searchable": true,"sortable": true,"visible": true } ] 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 0250b8dc0..96779e0c5 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 @@ -60,7 +60,7 @@ public class SDf54 extends SpcexObjectBase { private String Doc_Date; private String Value_date; private String Swift_ben; - private String Swift_intermed; + private String Swift_int; public String getSeg_type() { return seg_type; @@ -430,12 +430,12 @@ public class SDf54 extends SpcexObjectBase { this.Swift_ben = value; } - public String getSwift_intermed() { - return Swift_intermed; + public String getSwift_int() { + return Swift_int; } - public void setSwift_intermed(String value) { - this.Swift_intermed = value; + public void setSwift_int(String 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 5cd31e713..999e5d434 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 @@ -61,7 +61,7 @@ public class SDf55 extends SpcexObjectBase { private String Doc_Date; private String Value_date; private String Swift_ben; - private String Swift_intermed; + private String Swift_int; public String getSeg_type() { return seg_type; @@ -439,12 +439,12 @@ public class SDf55 extends SpcexObjectBase { this.Swift_ben = value; } - public String getSwift_intermed() { - return Swift_intermed; + public String getSwift_int() { + return Swift_int; } - public void setSwift_intermed(String value) { - this.Swift_intermed = value; + public void setSwift_int(String value) { + this.Swift_int = value; } } \ No newline at end of file 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 e017a0816..4c9ba02ce 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -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_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_INT varchar(11)); COMMENT ON TABLE S_DF54 IS 'ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414'; COMMENT ON COLUMN S_DF54.ID IS 'Идентификатор записи'; @@ -4623,13 +4623,13 @@ COMMENT ON COLUMN S_DF54._VALUE_DATE IS 'Дата валютирования'; COMMENT ON COLUMN S_DF54._SWIFT_BEN IS 'Свифт банка бенефициара'; -COMMENT ON COLUMN S_DF54._SWIFT_INTERMED IS 'Swift_intermed'; +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_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_INT varchar(11)); COMMENT ON TABLE S_DF55 IS 'ДФ-55 Квитанция об обработке ДФ-54'; COMMENT ON COLUMN S_DF55.ID IS 'Идентификатор записи'; @@ -4728,7 +4728,7 @@ COMMENT ON COLUMN S_DF55._VALUE_DATE IS 'Дата валютирования'; COMMENT ON COLUMN S_DF55._SWIFT_BEN IS 'Свифт банка бенефициара'; -COMMENT ON COLUMN S_DF55._SWIFT_INTERMED IS 'Swift_intermed'; +COMMENT ON COLUMN S_DF55._SWIFT_INT IS 'Свифт банка посредника'; GRANT ALL PRIVILEGES ON TABLE S_DF55 TO clearing; 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 72e6eba45..a6ce5d60e 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 @@ -288,23 +288,23 @@ 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_INTERMED 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_INTERMED IS 'Swift_intermed'; +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_INTERMED 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_INTERMED IS 'Swift_intermed'; +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); 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 44f1947e1..a503e0a0f 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,7 +58,7 @@ public class S_DF54_Converter extends DFConverter { values.add(typeMatch(entity.getDoc_Date())); values.add(typeMatch(entity.getValue_date())); values.add(typeMatch(entity.getSwift_ben())); - values.add(typeMatch(entity.getSwift_intermed())); + values.add(typeMatch(entity.getSwift_int())); return values.toArray(Object[]::new); } 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 2934ed3de..f5a917171 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_INTERMED" + "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" }; } @@ -102,7 +102,7 @@ public class SDf54MapStore extends TemplateMapStore { 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)); + object.setSwift_int(resultSet.getObject("_SWIFT_INT", String.class)); return object; } @@ -156,7 +156,7 @@ public class SDf54MapStore extends TemplateMapStore { object.getDoc_Date(), object.getValue_date(), object.getSwift_ben(), - object.getSwift_intermed() + object.getSwift_int() }; return args; } 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 f13590e26..c7ab16f4a 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_INTERMED" + "_DOC__NUM", "_DOC__DATE", "_VALUE_DATE", "_SWIFT_BEN", "_SWIFT_INT" }; } @@ -110,7 +110,7 @@ public class SDf55MapStore extends TemplateMapStore { 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)); + object.setSwift_int(resultSet.getObject("_SWIFT_INT", String.class)); return object; } @@ -165,7 +165,7 @@ public class SDf55MapStore extends TemplateMapStore { object.getDoc_Date(), object.getValue_date(), object.getSwift_ben(), - object.getSwift_intermed() + object.getSwift_int() }; return args; }