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 a4d163256..e345077d9 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.5.0.22", + "version": "3.5.0.23", "enums": { @@ -1726,7 +1726,7 @@ } , {"code": "corporationSoleType", - "type": 12,"dbname": "Код единоличного исполнительного органа","name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","searchable": true,"sortable": true,"visible": true,"link": "corporationSoleType" + "type": 12,"dbname": "Код единоличного исполнительного органа","name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","searchable": true,"sortable": true,"visible": true,"link": "corporationSoleType","ignore": true } , {"code": "countryCode", @@ -1734,7 +1734,7 @@ } , {"code": "description", - "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "professionalSign", @@ -1812,7 +1812,7 @@ } , {"code": "corporationSoleType", - "type": 12,"name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","link": "corporationSoleType" + "type": 12,"name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","link": "corporationSoleType","visible": false } , {"code": "legalKind", @@ -1840,7 +1840,7 @@ } , {"code": "description", - "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание компании" + "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание компании","visible": false } , {"code": "workflowStatus", @@ -2025,7 +2025,7 @@ } , {"code": "issuePlace", - "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "issuer", @@ -2033,11 +2033,11 @@ } , {"code": "issuerCode", - "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "name", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "number", @@ -2045,11 +2045,11 @@ } , {"code": "place", - "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Начало","searchable": true,"sortable": true + "type": 6,"name": "Дата начала срока действия","shortname": "Начало","searchable": true,"sortable": true,"ignore": true } , {"code": "validToDate", @@ -2085,7 +2085,7 @@ } , {"code": "issuePlace", - "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","required": true + "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","visible": false } , {"code": "issuer", @@ -2093,11 +2093,11 @@ } , {"code": "issuerCode", - "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","required": true + "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","visible": false } , {"code": "name", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","required": true + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","visible": false } , {"code": "number", @@ -2105,11 +2105,11 @@ } , {"code": "place", - "type": 2,"length": 255,"name": "Место","shortname": "Место","required": true + "type": 2,"length": 255,"name": "Место","shortname": "Место","visible": false } , {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Начало","required": true + "type": 6,"name": "Дата начала срока действия","shortname": "Начало","visible": false } , {"code": "validToDate", @@ -2146,7 +2146,7 @@ } , {"code": "issuePlace", - "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи" + "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","visible": false } , {"code": "issuer", @@ -2154,11 +2154,11 @@ } , {"code": "issuerCode", - "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган" + "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","visible": false } , {"code": "name", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ" + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","visible": false } , {"code": "number", @@ -2166,11 +2166,11 @@ } , {"code": "place", - "type": 2,"length": 255,"name": "Место","shortname": "Место" + "type": 2,"length": 255,"name": "Место","shortname": "Место","visible": false } , {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Начало" + "type": 6,"name": "Дата начала срока действия","shortname": "Начало","visible": false } , {"code": "validToDate", @@ -2391,7 +2391,7 @@ "fields": [ {"code": "countryCode", - "type": 12,"dbname": "Код страны","name": "Наименование страны","shortname": "Страна","searchable": true,"sortable": true,"visible": true,"link": "countryCode" + "type": 12,"dbname": "Код страны","name": "Наименование страны","shortname": "Страна","searchable": true,"sortable": true,"visible": true,"link": "countryCode","ignore": true } , {"code": "currencyCode", @@ -2423,15 +2423,15 @@ } , {"code": "description", - "type": 2,"length": 255,"name": "Описание","shortname": "Описание","searchable": true,"sortable": false + "type": 2,"length": 255,"name": "Описание","shortname": "Описание","searchable": true,"sortable": false,"ignore": true } , {"code": "startDate", - "type": 6,"name": "Дата начала действия","shortname": "Дата начала","searchable": true,"sortable": true + "type": 6,"name": "Дата начала действия","shortname": "Дата начала","searchable": true,"sortable": true,"ignore": true } , {"code": "endDate", - "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","searchable": true,"sortable": true + "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","searchable": true,"sortable": true,"ignore": true } , {"code": "nominalValue", @@ -2463,7 +2463,7 @@ } , {"code": "termType", - "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType" + "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType","ignore": true } , {"code": "lotSize", @@ -2499,7 +2499,7 @@ "name": "Добавление инструмента Денежного рынка", - "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency,startDate,endDate,termType", + "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", "fields": [ {"code": "securitySymbol", @@ -2531,19 +2531,19 @@ } , {"code": "startDate", - "type": 6,"name": "Дата начала действия","shortname": "Дата начала","required": true + "type": 6,"name": "Дата начала действия","shortname": "Дата начала","visible": false } , {"code": "endDate", - "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","required": true + "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","visible": false } , {"code": "termType", - "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","required": true + "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","visible": false } , {"code": "description", - "type": 2,"length": 255,"name": "Описание","shortname": "Описание" + "type": 2,"length": 255,"name": "Описание","shortname": "Описание","visible": false } , {"code": "issuerId", @@ -2576,7 +2576,7 @@ "name": "Изменение инструмента Денежного рынка", - "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency,startDate,endDate,termType", + "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", "fields": [ {"code": "id", @@ -2612,19 +2612,19 @@ } , {"code": "startDate", - "type": 6,"name": "Дата начала действия","shortname": "Дата начала","enabled": false + "type": 6,"name": "Дата начала действия","shortname": "Дата начала","enabled": false,"visible": false } , {"code": "endDate", - "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания" + "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","visible": false } , {"code": "termType", - "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType" + "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","visible": false } , {"code": "description", - "type": 2,"length": 255,"name": "Описание","shortname": "Описание" + "type": 2,"length": 255,"name": "Описание","shortname": "Описание","visible": false } , {"code": "issuerId", @@ -3531,7 +3531,7 @@ } , {"code": "code", - "type": 2,"length": 255,"name": "Код торгово-клирингового регистра","shortname": "Код ТКР","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Код торгово-клирингового регистра","shortname": "ТКР","searchable": true,"sortable": true,"visible": true } , {"code": "moneyAccountId", @@ -3596,15 +3596,31 @@ "name": "Изменение ТКР", - "confirmation": "companyId,moneyAccountId,depoAccountId,status", + "confirmation": "companyId,code,moneyAccountId,depoAccountId,status", "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true } + , + {"code": "companyId", + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","enabled": false + } + , + {"code": "code", + "type": 2,"length": 255,"name": "Код торгово-клирингового регистра","shortname": "ТКР","enabled": false + } + , + {"code": "moneyAccountId", + "type": 1,"name": "Номер денежного счета","shortname": "Денежный счет","link": "account","linkCode": "account","enabled": false + } + , + {"code": "depoAccountId", + "type": 1,"name": "Номер депозитарного счета","shortname": "Депозитарный счет","link": "account","linkCode": "account","enabled": false + } , {"code": "status", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "workflowStatus" + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","required": true } ] } @@ -4439,11 +4455,11 @@ } , {"code": "task", - "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task" + "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true } , {"code": "taskTime", - "type": 5,"name": "Время задачи","shortname": "Время задачи" + "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } , {"code": "section", @@ -4455,7 +4471,7 @@ } , {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus" + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true } , {"code": "companyId", @@ -4548,11 +4564,11 @@ } , {"code": "clearingDate", - "type": 6,"name": "Дата","shortname": "Дата" + "type": 6,"name": "Дата","shortname": "Дата","required": true } , {"code": "dayStatus", - "type": 12,"name": "Статус","shortname": "Статус","link": "dayStatus" + "type": 12,"name": "Статус","shortname": "Статус","link": "dayStatus","required": true } , {"code": "companyId", @@ -4685,15 +4701,15 @@ } , {"code": "task", - "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task" - } - , - {"code": "taskTime", - "type": 5,"name": "Время задачи","shortname": "Время задачи" + "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true } , {"code": "clearingDate", - "type": 6,"name": "Дата задачи","shortname": "Дата задачи" + "type": 6,"name": "Дата задачи","shortname": "Дата задачи","required": true + } + , + {"code": "taskTime", + "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } , {"code": "section", @@ -4705,7 +4721,7 @@ } , {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus" + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true } , {"code": "companyId", 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 6273184e6..7527dd5e0 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 @@ - + @@ -388,9 +388,9 @@ - + - + @@ -410,14 +410,14 @@ - + - + @@ -465,13 +465,13 @@ - + - - + + - - + + @@ -480,13 +480,13 @@ - + - - + + - - + + @@ -495,13 +495,13 @@ - + - - + + - - + + @@ -553,15 +553,15 @@ - + - - - + + + @@ -569,7 +569,7 @@ - + @@ -578,7 +578,7 @@ - + @@ -586,10 +586,10 @@ - - - - + + + + @@ -597,7 +597,7 @@ - + @@ -606,10 +606,10 @@ - - - - + + + + @@ -823,7 +823,7 @@ - + @@ -839,9 +839,13 @@ - + - + + + + + @@ -1042,11 +1046,11 @@ - - + +
- + @@ -1070,8 +1074,8 @@ - - + + @@ -1105,12 +1109,12 @@ - - - + + +
- + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index a4d163256..e345077d9 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.5.0.22", + "version": "3.5.0.23", "enums": { @@ -1726,7 +1726,7 @@ } , {"code": "corporationSoleType", - "type": 12,"dbname": "Код единоличного исполнительного органа","name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","searchable": true,"sortable": true,"visible": true,"link": "corporationSoleType" + "type": 12,"dbname": "Код единоличного исполнительного органа","name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","searchable": true,"sortable": true,"visible": true,"link": "corporationSoleType","ignore": true } , {"code": "countryCode", @@ -1734,7 +1734,7 @@ } , {"code": "description", - "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "professionalSign", @@ -1812,7 +1812,7 @@ } , {"code": "corporationSoleType", - "type": 12,"name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","link": "corporationSoleType" + "type": 12,"name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","link": "corporationSoleType","visible": false } , {"code": "legalKind", @@ -1840,7 +1840,7 @@ } , {"code": "description", - "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание компании" + "type": 2,"length": 255,"name": "Описание компании","shortname": "Описание компании","visible": false } , {"code": "workflowStatus", @@ -2025,7 +2025,7 @@ } , {"code": "issuePlace", - "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "issuer", @@ -2033,11 +2033,11 @@ } , {"code": "issuerCode", - "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "name", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "number", @@ -2045,11 +2045,11 @@ } , {"code": "place", - "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Начало","searchable": true,"sortable": true + "type": 6,"name": "Дата начала срока действия","shortname": "Начало","searchable": true,"sortable": true,"ignore": true } , {"code": "validToDate", @@ -2085,7 +2085,7 @@ } , {"code": "issuePlace", - "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","required": true + "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","visible": false } , {"code": "issuer", @@ -2093,11 +2093,11 @@ } , {"code": "issuerCode", - "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","required": true + "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","visible": false } , {"code": "name", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","required": true + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","visible": false } , {"code": "number", @@ -2105,11 +2105,11 @@ } , {"code": "place", - "type": 2,"length": 255,"name": "Место","shortname": "Место","required": true + "type": 2,"length": 255,"name": "Место","shortname": "Место","visible": false } , {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Начало","required": true + "type": 6,"name": "Дата начала срока действия","shortname": "Начало","visible": false } , {"code": "validToDate", @@ -2146,7 +2146,7 @@ } , {"code": "issuePlace", - "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи" + "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","visible": false } , {"code": "issuer", @@ -2154,11 +2154,11 @@ } , {"code": "issuerCode", - "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган" + "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Выдавший орган","visible": false } , {"code": "name", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ" + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","visible": false } , {"code": "number", @@ -2166,11 +2166,11 @@ } , {"code": "place", - "type": 2,"length": 255,"name": "Место","shortname": "Место" + "type": 2,"length": 255,"name": "Место","shortname": "Место","visible": false } , {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Начало" + "type": 6,"name": "Дата начала срока действия","shortname": "Начало","visible": false } , {"code": "validToDate", @@ -2391,7 +2391,7 @@ "fields": [ {"code": "countryCode", - "type": 12,"dbname": "Код страны","name": "Наименование страны","shortname": "Страна","searchable": true,"sortable": true,"visible": true,"link": "countryCode" + "type": 12,"dbname": "Код страны","name": "Наименование страны","shortname": "Страна","searchable": true,"sortable": true,"visible": true,"link": "countryCode","ignore": true } , {"code": "currencyCode", @@ -2423,15 +2423,15 @@ } , {"code": "description", - "type": 2,"length": 255,"name": "Описание","shortname": "Описание","searchable": true,"sortable": false + "type": 2,"length": 255,"name": "Описание","shortname": "Описание","searchable": true,"sortable": false,"ignore": true } , {"code": "startDate", - "type": 6,"name": "Дата начала действия","shortname": "Дата начала","searchable": true,"sortable": true + "type": 6,"name": "Дата начала действия","shortname": "Дата начала","searchable": true,"sortable": true,"ignore": true } , {"code": "endDate", - "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","searchable": true,"sortable": true + "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","searchable": true,"sortable": true,"ignore": true } , {"code": "nominalValue", @@ -2463,7 +2463,7 @@ } , {"code": "termType", - "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType" + "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType","ignore": true } , {"code": "lotSize", @@ -2499,7 +2499,7 @@ "name": "Добавление инструмента Денежного рынка", - "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency,startDate,endDate,termType", + "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", "fields": [ {"code": "securitySymbol", @@ -2531,19 +2531,19 @@ } , {"code": "startDate", - "type": 6,"name": "Дата начала действия","shortname": "Дата начала","required": true + "type": 6,"name": "Дата начала действия","shortname": "Дата начала","visible": false } , {"code": "endDate", - "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","required": true + "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","visible": false } , {"code": "termType", - "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","required": true + "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","visible": false } , {"code": "description", - "type": 2,"length": 255,"name": "Описание","shortname": "Описание" + "type": 2,"length": 255,"name": "Описание","shortname": "Описание","visible": false } , {"code": "issuerId", @@ -2576,7 +2576,7 @@ "name": "Изменение инструмента Денежного рынка", - "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency,startDate,endDate,termType", + "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", "fields": [ {"code": "id", @@ -2612,19 +2612,19 @@ } , {"code": "startDate", - "type": 6,"name": "Дата начала действия","shortname": "Дата начала","enabled": false + "type": 6,"name": "Дата начала действия","shortname": "Дата начала","enabled": false,"visible": false } , {"code": "endDate", - "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания" + "type": 6,"name": "Дата окончания действия","shortname": "Дата окончания","visible": false } , {"code": "termType", - "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType" + "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","visible": false } , {"code": "description", - "type": 2,"length": 255,"name": "Описание","shortname": "Описание" + "type": 2,"length": 255,"name": "Описание","shortname": "Описание","visible": false } , {"code": "issuerId", @@ -3531,7 +3531,7 @@ } , {"code": "code", - "type": 2,"length": 255,"name": "Код торгово-клирингового регистра","shortname": "Код ТКР","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Код торгово-клирингового регистра","shortname": "ТКР","searchable": true,"sortable": true,"visible": true } , {"code": "moneyAccountId", @@ -3596,15 +3596,31 @@ "name": "Изменение ТКР", - "confirmation": "companyId,moneyAccountId,depoAccountId,status", + "confirmation": "companyId,code,moneyAccountId,depoAccountId,status", "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true } + , + {"code": "companyId", + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","enabled": false + } + , + {"code": "code", + "type": 2,"length": 255,"name": "Код торгово-клирингового регистра","shortname": "ТКР","enabled": false + } + , + {"code": "moneyAccountId", + "type": 1,"name": "Номер денежного счета","shortname": "Денежный счет","link": "account","linkCode": "account","enabled": false + } + , + {"code": "depoAccountId", + "type": 1,"name": "Номер депозитарного счета","shortname": "Депозитарный счет","link": "account","linkCode": "account","enabled": false + } , {"code": "status", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "workflowStatus" + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","required": true } ] } @@ -4439,11 +4455,11 @@ } , {"code": "task", - "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task" + "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true } , {"code": "taskTime", - "type": 5,"name": "Время задачи","shortname": "Время задачи" + "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } , {"code": "section", @@ -4455,7 +4471,7 @@ } , {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus" + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true } , {"code": "companyId", @@ -4548,11 +4564,11 @@ } , {"code": "clearingDate", - "type": 6,"name": "Дата","shortname": "Дата" + "type": 6,"name": "Дата","shortname": "Дата","required": true } , {"code": "dayStatus", - "type": 12,"name": "Статус","shortname": "Статус","link": "dayStatus" + "type": 12,"name": "Статус","shortname": "Статус","link": "dayStatus","required": true } , {"code": "companyId", @@ -4685,15 +4701,15 @@ } , {"code": "task", - "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task" - } - , - {"code": "taskTime", - "type": 5,"name": "Время задачи","shortname": "Время задачи" + "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true } , {"code": "clearingDate", - "type": 6,"name": "Дата задачи","shortname": "Дата задачи" + "type": 6,"name": "Дата задачи","shortname": "Дата задачи","required": true + } + , + {"code": "taskTime", + "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } , {"code": "section", @@ -4705,7 +4721,7 @@ } , {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus" + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true } , {"code": "companyId", diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java index 2e70f0eda..c6b65e707 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java @@ -21,7 +21,7 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder; import ru.spcex.clearing.util.security.UserRoleVerification; -import ru.spcex.platform.enumeration.DayStatus; +import ru.spcex.platform.enumeration.Status; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.enumeration.IMessageResolver; @@ -106,7 +106,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin plannerTemplate.setSecurityId(req.getSecurityId()); plannerTemplateMap.insert(plannerTemplate); - if (todayWorkDay()) { + if (todayWorkDay() && Status.Active.equalsByKey(plannerTemplate.getTaskStatus())) { PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(plannerTemplate).build(); plannerAllTodayMap.insert(plannerAllToday); addToPlannerQueue(TaskManager.Process.add, plannerAllToday); @@ -143,7 +143,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin plannerAllToday.setId(oldPlannerAllToday.getId()); plannerAllTodayMap.insert(plannerAllToday); addToPlannerQueue(TaskManager.Process.update, oldPlannerAllToday); - }else { + } else if (Status.Active.equalsByKey(plannerTemplate.getTaskStatus())) { plannerAllTodayMap.insert(plannerAllToday); addToPlannerQueue(TaskManager.Process.add, plannerAllToday); } @@ -165,7 +165,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin if (todayWorkDay()) { PlannerAllToday plannerAllToday = plannerAllTodayMap.getSingleObjectBySQL(String.format("parentId = %s", plannerTemplate.getId())); - if (plannerAllToday != null){ + if (plannerAllToday != null) { plannerAllTodayMap.delete(plannerAllToday); addToPlannerQueue(TaskManager.Process.delete, plannerAllToday); } @@ -178,13 +178,12 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin LocalDate currentDate = LocalDate.now(); boolean isWeekend = Arrays.asList(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY).contains(currentDate.getDayOfWeek()); //проверим есть ли другие записи clearingCalendar с таким же clearingDate, если они актуальные ничего не удаляем - Collection clearingCalendars = clearingCalendarMap.getCollectionObjectsByFieldValues(Map.of("dayStatus", DayStatus.Workday.getKey(), - "clearingDate", currentDate)); + Collection clearingCalendars = clearingCalendarMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", currentDate)); if (clearingCalendars != null && !clearingCalendars.isEmpty()) { for (ClearingCalendar calendar : clearingCalendars) { if (isValidWorkday(calendar, isWeekend)) return true; } - } + } else return !isWeekend; return false; } }