treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-613 DDL

Browse source
This commit is contained in:
AKurakin 2024-04-03 17:32:51 +03:00
parent 867d5f928a
commit 7d8def669d
10 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/backend-api/src/main/resources/meta/meta.json
View file

@ -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
}
]

4
clearing-parent/backend-api/src/main/resources/meta/meta.xml
View file

@ -2188,7 +2188,7 @@
<Doc_Date field="Doc_Date" type="2" length="8" name="Дата выгружаемого документа" shortname="Дата выгружаемого документа" searchable="true" sortable="true" visible="true"/>
<Value_date field="Value_date" type="2" length="8" name="Дата валютирования" shortname="Дата валютирования" searchable="true" sortable="true" visible="true"/>
<Swift_ben field="Swift_ben" type="2" length="11" name="Свифт банка бенефициара" shortname="Свифт банка бенефициара" searchable="true" sortable="true" visible="true"/>
<Swift_intermed field="Swift_intermed" type="2" length="11" name="Swift_intermed" shortname="Swift_intermed" searchable="true" sortable="true" visible="true"/>
<Swift_int field="Swift_int" type="2" length="11" name="Свифт банка посредника" shortname="Свифт банка посредника" searchable="true" sortable="true" visible="true"/>
</sDf54>
<sDf55 name="ДФ-55 Квитанция об обработке ДФ-54" destination="s-dfs/s-df55" class="ru.clearing.classes.statics.data.sdf.SDf55" table="s_df_55">
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="false"/>
@ -2239,7 +2239,7 @@
<Doc_Date field="Doc_Date" type="2" length="8" name="Дата выгружаемого документа" shortname="Дата выгружаемого документа" searchable="true" sortable="true" visible="true"/>
<Value_date field="Value_date" type="2" length="8" name="Дата валютирования" shortname="Дата валютирования" searchable="true" sortable="true" visible="true"/>
<Swift_ben field="Swift_ben" type="2" length="11" name="Свифт банка бенефициара" shortname="Свифт банка бенефициара" searchable="true" sortable="true" visible="true"/>
<Swift_intermed field="Swift_intermed" type="2" length="11" name="Swift_intermed" shortname="Swift_intermed" searchable="true" sortable="true" visible="true"/>
<Swift_int field="Swift_int" type="2" length="11" name="Свифт банка посредника" shortname="Свифт банка посредника" searchable="true" sortable="true" visible="true"/>
</sDf55>
<sDf56 name="ДФ-56 Запрос транзакций за период" destination="s-dfs/s-df56" class="ru.clearing.classes.statics.data.sdf.SDf56" table="s_df_56">
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="false"/>

8
clearing-parent/backend-api/src/test/resources/meta.json
View file

@ -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
}
]

10
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java
View file

@ -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;
}
}

10
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java
View file

@ -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;
}
}

8
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -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;

8
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql
View file

@ -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);

2
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java
View file

@ -58,7 +58,7 @@ public class S_DF54_Converter extends DFConverter<SDf54> {
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);
}

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java
View file

@ -33,7 +33,7 @@ public class SDf54MapStore extends TemplateMapStore<SDf54> {
@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<SDf54> {
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<SDf54> {
object.getDoc_Date(),
object.getValue_date(),
object.getSwift_ben(),
object.getSwift_intermed()
object.getSwift_int()
};
return args;
}

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java
View file

@ -40,7 +40,7 @@ public class SDf55MapStore extends TemplateMapStore<SDf55> {
"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<SDf55> {
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<SDf55> {
object.getDoc_Date(),
object.getValue_date(),
object.getSwift_ben(),
object.getSwift_intermed()
object.getSwift_int()
};
return args;
}