From 9ec8e6d0ab1619f7b033181d488eba36f16c7629 Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Wed, 15 Oct 2025 14:17:43 +0300 Subject: [PATCH 01/11] add 2 form --- .../Личный кабинет юр лица.page | 1582 +++++++++++++++-- 1 file changed, 1447 insertions(+), 135 deletions(-) diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 20deeacb..1aa31c0a 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -251,6 +251,7 @@ c9898352-a317-4117-bfcc-28b5c4d9a0d1 Горизонтальный контейнер true + false false @@ -355,6 +356,7 @@ 1be5e2cd-f42e-40c6-971c-e92f997a7139 Горизонтальный контейнер true + false false @@ -444,6 +446,7 @@ a6c5ce4e-9773-45ee-9153-9cd79ef13a97 Hbox_9 true + false false @@ -623,6 +626,7 @@ ea3e7a6d-e69c-4ef0-8a80-d8fd038a8c1e Hbox_9_ true + false false @@ -780,6 +784,7 @@ 8a23f760-b1fc-436a-8bd5-f87664c7a50f Hbox true + false false @@ -1654,6 +1659,7 @@ 7ea732e4-71c7-4325-8569-462acbea89b8 Вертикальный контейнер true + false false @@ -1852,6 +1858,7 @@ b8373653-133f-43cd-a8c2-ba83f232d379 Вертикальный контейнер true + false false @@ -2016,6 +2023,7 @@ c4d501b1-7565-45c3-8722-d624126f6cfb Вертикальный контейнер true + false false @@ -4637,7 +4645,7 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -4672,7 +4680,7 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -4753,6 +4761,181 @@ false + + + + + + + + + + + + behavior + + {"objectId":"bee4c3f7-05b0-4b21-81bb-48249a1bdfdb","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"a8e76694-830b-4f22-9a5b-bb0efe0d7745","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"77096468-9f51-4e2c-93a8-97a38d89570e","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"2b87f279-a5eb-445f-b96e-4d12b6217126","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"c22b9906-4d5e-48df-b084-f0ac331de04c","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + @@ -4917,38 +5100,7 @@ c12d155e-947d-41b6-aef0-23080fdc82c0 Текст false - false - - - - cssClasses - - - - "subtitle" - - - - - - - - - - - initialValue - - "Изменения сведений сотрудников, необходимых для ведения воинского учета" - - - - - - - - - false - + true 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 @@ -5039,6 +5191,868 @@ + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 998f235b-9d72-4f87-950b-1ec90e3d8b90 + Вертикальный контейнер + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c12d155e-947d-41b6-aef0-23080fdc82c0 + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Изменения сведений сотрудников, необходимых для ведения воинского учета" + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + dbb46f04-0f9b-42bc-8a85-2b8b8dc7c246 + Текст + false + true + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + f8c09ec6-d52a-4398-a40e-a237f4305b88 + Csv file + false + false + false + +false +true + + + + ErvuFileUploadWithAdditionalFiles + ervu.component.fileupload + +true +true + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + displayFileSize + + true + + + + displayProgressBar + + true + + + + extensionFilter + + + + "csv" + + + + + + + formType + + "FORM_2" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + mchdFileUploadRef + + {"objectId":"0f616bc4-9148-4d3e-b374-269a91ed54f2","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + signFileUploadRef + + {"objectId":"a8e76694-830b-4f22-9a5b-bb0efe0d7745","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + visible + + true + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + a3c544ce-f22e-4d7c-a879-4827832742f8 + Текст + false + true + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 0970e79a-7130-4c23-bdc8-13f8554daa59 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - csv" + + + + + + + + +false + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 6345d7cc-c606-4195-acc2-bc9cfcd300ae + Вертикальный контейнер + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + bee4c3f7-05b0-4b21-81bb-48249a1bdfdb + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + + + + + + + + +false + + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + a8e76694-830b-4f22-9a5b-bb0efe0d7745 + Подпись File + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "sig" + + + + + + formType + + "FORM_2" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 77096468-9f51-4e2c-93a8-97a38d89570e + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - sig" + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 4234108a-2b52-4b6f-be54-75590266b711 + Вертикальный контейнер + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + d320bfdf-0416-43da-bed8-a4a2131869d7 + Вертикальный контейнер + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 4234108a-2b52-4b6f-be54-75590266b711 + Вертикальный контейнер + true + false + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + bb63fe78-e531-4e67-921a-91eff8cd6406 + AC_МЧД + false + false + + + + elseActions + + + + + + behavior + +{"objectId":"0f616bc4-9148-4d3e-b374-269a91ed54f2","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + +{"objectId":"f6e4a42a-020e-4b2a-b6e7-6f48024fb438","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + eventRefs + + + + + + behavior + +{"objectId":"2b87f279-a5eb-445f-b96e-4d12b6217126","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + propertyName + +"userChangeValueEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + +objectValue + + + + behavior + + {"objectId":"2b87f279-a5eb-445f-b96e-4d12b6217126","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + +staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + +{"objectId":"0f616bc4-9148-4d3e-b374-269a91ed54f2","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + +{"objectId":"f6e4a42a-020e-4b2a-b6e7-6f48024fb438","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + 2b87f279-a5eb-445f-b96e-4d12b6217126 + Check box + false + false + + + + label + + null + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c22b9906-4d5e-48df-b084-f0ac331de04c + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + initialValue + + "Внимание: если файл подписан не руководителем организации, рекомендуется приложить МЧД" + + + + + + + + +false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 871b2ab1-fd6a-41fc-97a7-c60052da8272 + Hbox + true + true + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + 0f616bc4-9148-4d3e-b374-269a91ed54f2 + Мчд File + false + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "xml" + + + + + + formType + + "FORM_2" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + visible + + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + f6e4a42a-020e-4b2a-b6e7-6f48024fb438 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - xml" + + + + visible + + false + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 77c7fa81-93a3-49fb-8263-696fd3acda92 + Vbox + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + c965e7ee-ddce-446c-a8cd-7264f9bbc2fd + Vbox + true + true + + 5ebd2885-0972-4e51-8376-1fa66aed9a90 e4d86cdd-b219-46e8-a59f-3c9b38108de4 @@ -5051,73 +6065,7 @@ ba4ed1be-acc7-456d-aec2-e29d56f05113 FileUploadV2 false - false - - - - collectible - - false - - - - cssClasses - - - - "btn-main" - - - - - - extensionFilter - - - - "csv" - - - - - - formType - - "FORM_2" - - - - maxFileSizeMb - - 5.0 - - - - maxFilesToUpload - - 1.0 - - - - removeFileButtonName - - "Удалить" - - - - selectFileButtonName - - "Выбрать" - - - - selectFileFieldText - - "Перетащите файл или выберите на компьютере" - - - - + true 98594cec-0a9b-4cef-af09-e1b71cb2ad9e @@ -5142,7 +6090,25 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileAddedEvent" + + + + + + + + + + behavior + + {"objectId":"a8e76694-830b-4f22-9a5b-bb0efe0d7745","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -5163,6 +6129,108 @@ conditions + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"a8e76694-830b-4f22-9a5b-bb0efe0d7745","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + @@ -5170,7 +6238,7 @@ logicalOperation - null + "AND" @@ -5242,7 +6310,25 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileDeletedEvent" + + + + + + + + + + behavior + + {"objectId":"a8e76694-830b-4f22-9a5b-bb0efe0d7745","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -5385,7 +6471,7 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -5413,33 +6499,7 @@ 0970e79a-7130-4c23-bdc8-13f8554daa59 Текст false - false - - - - cssClasses - - - - "mute" - - - - - - initialValue - - "Поддерживаемый формат файла - csv" - - - - - - - - - false - + true fd7e47b9-dce1-4d14-9f3a-580c79f59579 @@ -5497,7 +6557,7 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -5734,6 +6794,251 @@ false + + + + + + + + + + + + behavior + + {"objectId":"bee4c3f7-05b0-4b21-81bb-48249a1bdfdb","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"a8e76694-830b-4f22-9a5b-bb0efe0d7745","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"77096468-9f51-4e2c-93a8-97a38d89570e","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"2b87f279-a5eb-445f-b96e-4d12b6217126","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"c22b9906-4d5e-48df-b084-f0ac331de04c","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"0f616bc4-9148-4d3e-b374-269a91ed54f2","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"f6e4a42a-020e-4b2a-b6e7-6f48024fb438","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + @@ -5763,7 +7068,7 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -5870,7 +7175,7 @@ behavior - {"objectId":"ba4ed1be-acc7-456d-aec2-e29d56f05113","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f8c09ec6-d52a-4398-a40e-a237f4305b88","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -5961,6 +7266,13 @@ + + 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a + 89bcd110-0dc0-4aaa-9a4f-172858b2ce03 + Диалог - выбор файла и отправка + true + true + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 b50c6499-5c81-4fc3-b9ce-02cc1124e673 From 120f851d195d7857acb22d74669a9be38c687eb0 Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Wed, 15 Oct 2025 15:16:54 +0300 Subject: [PATCH 02/11] form 10 --- .../Личный кабинет юр лица.page | 1595 +++++++++++++++-- 1 file changed, 1465 insertions(+), 130 deletions(-) diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 1aa31c0a..1fc0d641 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -221,6 +221,7 @@ 3e78f422-3db3-45b9-b531-f4aec5314dab Группа полей true + false false @@ -4044,6 +4045,7 @@ be4863fe-d25f-4965-ae52-8552ab5e8cf9 Hbox_2 true + false false @@ -4227,6 +4229,7 @@ 52b1c7dd-7763-4f50-84ed-0471a83dd0b4 Hbox_2_ true + false false @@ -4396,6 +4399,7 @@ dd3fd6ce-3f62-436c-b641-522042f189ff Hbox true + false false @@ -7479,6 +7483,7 @@ 47a51ceb-a4db-4caf-a234-4389e2456f66 Hbox_10 true + false false @@ -7655,6 +7660,7 @@ fb8317a8-f9ed-4da3-8018-be3d8efbc469 Hbox_10_ true + false false @@ -7798,6 +7804,13 @@ + + 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a + b59b46f5-0b45-4a0e-99d9-1eed7060be97 + Диалог - выбор файла и отправка НОВЫЙ + true + true + e32ae1f5-5b14-45f1-abb6-f52c34b3b570 aa0a8f53-5fdb-4c6c-b364-008e09088c3a @@ -7822,7 +7835,7 @@ 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a 89fcffd4-3cf5-4c26-9b49-f8a366aa6f27 - Диалог - выбор файла и отправка + Диалог - выбор файла и отправка СТАРЫЙ true false @@ -7849,6 +7862,12 @@ false + + elseActions + + + + eventRefs @@ -8023,7 +8042,7 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -8058,7 +8077,7 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -8139,6 +8158,184 @@ false + + + + + + + + + + + + + + + behavior + + {"objectId":"9b35b57e-d173-4f38-a1b3-7caf32b601f4","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"b7b6470e-64df-4930-9522-c8a5f01ab493","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"c3389547-2857-4464-8d11-87646677e390","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"f8953a9f-71f4-4095-873c-f924960167bb","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"95fb07cd-5071-412e-8c70-19fbbcf1f70f","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + @@ -8303,38 +8500,7 @@ faef9178-0311-4a71-957b-54bcd5221517 Текст false - false - - - - cssClasses - - - - "subtitle" - - - - - - - - - - - initialValue - - "Сообщение о гражданах, не состоящих, но обязанных состоять на воинском учете" - - - - - - - - - false - + true 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 @@ -8437,73 +8603,876 @@ 623c8ded-d64e-40b4-b1bb-2db70083ae4f FileUploadV2 false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + ce89da7c-85a0-4670-870b-f6ad52d65591 + Вертикальный контейнер + true false - - - - collectible - - false - - - - cssClasses - - + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + faef9178-0311-4a71-957b-54bcd5221517 + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Сообщение о гражданах, не состоящих, но обязанных состоять на воинском учете" + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + b93c1470-2577-4be2-ba77-4081940486ce + Текст + false + true + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + 3d0d0314-ea5f-4974-a92d-32c11ce90861 + Csv file + false + false + false + +false +true + + + + ErvuFileUploadWithAdditionalFiles + ervu.component.fileupload + +true +true + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + displayFileSize + + true + + + + displayProgressBar + + true + + + + extensionFilter + + + + "csv" + + + + + + + formType + + "FORM_10" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + mchdFileUploadRef + + {"objectId":"51b39385-98cf-4890-8a14-96e371027d05","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + signFileUploadRef + + {"objectId":"b7b6470e-64df-4930-9522-c8a5f01ab493","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + visible + + true + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 87df2042-bf8e-4182-9abc-34a7b2ec8165 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - csv" + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 1bb8f548-1b8e-4bda-b265-0ed6fce660e8 + Текст + false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 276d7e73-eba9-4859-942f-af19f7ff535f + Вертикальный контейнер + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 276d7e73-eba9-4859-942f-af19f7ff535f + Вертикальный контейнер + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 9b35b57e-d173-4f38-a1b3-7caf32b601f4 + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + + + + + + + + +false + + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + b7b6470e-64df-4930-9522-c8a5f01ab493 + Подпись File + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "sig" + + + + + + formType + + "FORM_10" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c3389547-2857-4464-8d11-87646677e390 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - sig" + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + fe37be88-aca5-4191-b5e1-a914a8603965 + Вертикальный контейнер + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + bdf5ede5-8183-4e07-9f5b-a49dc03978bd + Вертикальный контейнер + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 137c8ee8-cee3-474c-8883-733aaa7ed95e + Вертикальный контейнер + true + false + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 6485951d-c7ca-4df8-835f-6d326215fb99 + AC_МЧД + false + false + + + + elseActions + + + + + + behavior + +{"objectId":"51b39385-98cf-4890-8a14-96e371027d05","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + +{"objectId":"71bc3168-e362-4cd1-8c0f-2df719d8f3fe","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + eventRefs + + + + + + behavior + +{"objectId":"f8953a9f-71f4-4095-873c-f924960167bb","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + propertyName + +"userChangeValueEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + +objectValue + + + + behavior - "btn-main" + {"objectId":"f8953a9f-71f4-4095-873c-f924960167bb","packageName":"component.field","className":"CheckBox","type":"TS"} - - - - - extensionFilter - - + + + method - "csv" + "getValue" - - - - - formType - - "FORM_10" - - - - maxFileSizeMb - - 5.0 - - - - maxFilesToUpload - - 1.0 - - - - removeFileButtonName - - "Удалить" - - - - selectFileButtonName - - "Выбрать" - - - - selectFileFieldText - - "Перетащите файл или выберите на компьютере" - - - - + + + + + + + + + conditionSecondPart + + + +staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + +{"objectId":"51b39385-98cf-4890-8a14-96e371027d05","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + +{"objectId":"71bc3168-e362-4cd1-8c0f-2df719d8f3fe","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + f8953a9f-71f4-4095-873c-f924960167bb + Check box + false + false + + + + label + + null + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 95fb07cd-5071-412e-8c70-19fbbcf1f70f + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + initialValue + + "Внимание: если файл подписан не руководителем организации, рекомендуется приложить МЧД" + + + + + + + + +false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + adbccde8-fa29-4c5f-961e-a042a90d5d12 + Hbox + true + true + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + 51b39385-98cf-4890-8a14-96e371027d05 + Мчд File + false + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "xml" + + + + + + formType + + "FORM_10" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + visible + + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 71bc3168-e362-4cd1-8c0f-2df719d8f3fe + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - xml" + + + + visible + + false + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + e6ff2b0f-a6a1-4ab2-aefe-6ba208808eb3 + Vbox + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 56a78b9f-9f5f-4d7c-85a4-e71860886d5a + Vbox + true + true + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e @@ -8528,7 +9497,25 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileAddedEvent" + + + + + + + + + + behavior + + {"objectId":"b7b6470e-64df-4930-9522-c8a5f01ab493","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -8549,6 +9536,108 @@ conditions + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"b7b6470e-64df-4930-9522-c8a5f01ab493","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + @@ -8628,7 +9717,25 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileDeletedEvent" + + + + + + + + + + behavior + + {"objectId":"b7b6470e-64df-4930-9522-c8a5f01ab493","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -8771,7 +9878,7 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -8799,33 +9906,7 @@ 87df2042-bf8e-4182-9abc-34a7b2ec8165 Текст false - false - - - - cssClasses - - - - "mute" - - - - - - initialValue - - "Поддерживаемый формат файла - csv" - - - - - - - - - false - + true fd7e47b9-dce1-4d14-9f3a-580c79f59579 @@ -8883,7 +9964,7 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -9120,6 +10201,251 @@ false + + + + + + + + + + + + behavior + + {"objectId":"9b35b57e-d173-4f38-a1b3-7caf32b601f4","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"b7b6470e-64df-4930-9522-c8a5f01ab493","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"c3389547-2857-4464-8d11-87646677e390","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"f8953a9f-71f4-4095-873c-f924960167bb","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"95fb07cd-5071-412e-8c70-19fbbcf1f70f","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"51b39385-98cf-4890-8a14-96e371027d05","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"71bc3168-e362-4cd1-8c0f-2df719d8f3fe","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + @@ -9149,7 +10475,7 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -9256,7 +10582,7 @@ behavior - {"objectId":"623c8ded-d64e-40b4-b1bb-2db70083ae4f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"3d0d0314-ea5f-4974-a92d-32c11ce90861","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -9346,6 +10672,13 @@ + + 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a + b59b46f5-0b45-4a0e-99d9-1eed7060be97 + Диалог - выбор файла и отправка + true + true + d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -9413,6 +10746,7 @@ 7057bbcb-cff2-4e31-812d-ba7e043a4bcc Группа полей true + false false @@ -11538,6 +12872,7 @@ 991237d3-8cb9-48af-8501-030a3c8c6cfc Группа полей true + false false From 3fe3ef6921a8ce75383bde5068508949b6dd83a2 Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Wed, 15 Oct 2025 15:40:21 +0300 Subject: [PATCH 03/11] form 11 --- .../Личный кабинет юр лица.page | 1554 +++++++++++++++-- 1 file changed, 1423 insertions(+), 131 deletions(-) diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 1fc0d641..3fc09859 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -7290,6 +7290,7 @@ ae731885-3bdd-433d-a29c-37d5811585a7 Группа полей true + false false @@ -7835,7 +7836,7 @@ 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a 89fcffd4-3cf5-4c26-9b49-f8a366aa6f27 - Диалог - выбор файла и отправка СТАРЫЙ + Диалог - выбор файла и отправка true false @@ -10746,7 +10747,6 @@ 7057bbcb-cff2-4e31-812d-ba7e043a4bcc Группа полей true - false false @@ -10940,6 +10940,7 @@ 87d2523e-91a0-49ef-9f87-2adc4ff1165a Hbox_11 true + false false @@ -11116,6 +11117,7 @@ a072a677-36d0-4616-a0bd-3541ebae45c8 Hbox_11_ true + false false @@ -11535,7 +11537,7 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -11570,7 +11572,7 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -11651,6 +11653,181 @@ false + + + + + + + + + + + + behavior + + {"objectId":"e6baac95-674d-4833-8eaa-142ed5ed0f02","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"52a47dd7-0448-4934-aba0-72c95b93b091","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"17c7b00e-9ea7-47e8-a841-3c49fc24123b","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"780dba1a-b9a9-4a98-9bf0-40dc91577fb7","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + @@ -11815,38 +11992,7 @@ e901dbfc-6ae7-4e81-8702-3a99005376f2 Текст false - false - - - - cssClasses - - - - "subtitle" - - - - - - - - - - - initialValue - - "Ежегодное предоставление списка граждан мужского пола, подлежащих постановке на воинский учет в следующем году по достижении 17 - летнего возраста" - - - - - - - - - false - + true 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 @@ -11949,73 +12095,862 @@ 9c49eea1-7d04-4d99-b213-59aa51499acc FileUploadV2 false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 36ed9134-7e97-45ea-8215-261f65e69077 + Вертикальный контейнер + true false - - - - collectible - - false - - - - cssClasses - - + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + e901dbfc-6ae7-4e81-8702-3a99005376f2 + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Ежегодное предоставление списка граждан мужского пола, подлежащих постановке на воинский учет в следующем году по достижении 17 - летнего возраста" + + + + + + + + +false + + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + d202441d-c2ae-4e34-970e-78166e8c4ea9 + Csv file + false + false + false + +false +true + + + + ErvuFileUploadWithAdditionalFiles + ervu.component.fileupload + +true +true + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + displayFileSize + + true + + + + displayProgressBar + + true + + + + extensionFilter + + + + "csv" + + + + + + + formType + + "FORM_11" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + mchdFileUploadRef + + {"objectId":"f47e3ad9-6065-41a7-862d-991c41f1bdfa","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + signFileUploadRef + + {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + visible + + true + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d4f96505-0b2a-4e7b-87c6-e79f1987da66 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - csv" + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 4c2623d7-445f-4d4c-9c1a-98e033e206fb + Вертикальный контейнер + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 40e1b3d6-57ff-4ef7-b93f-72e0c2661b70 + Вертикальный контейнер + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + e6baac95-674d-4833-8eaa-142ed5ed0f02 + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + + + + + + + + +false + + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1 + Подпись File + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "sig" + + + + + + formType + + "FORM_11" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 52a47dd7-0448-4934-aba0-72c95b93b091 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - sig" + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 4b296222-446c-45d5-8a74-019f505c9e7e + Вертикальный контейнер + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 77cd6896-3da8-47f7-8ce3-c08a5e42b959 + Вертикальный контейнер + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + cae94ea0-75e1-408a-8ad7-34a07b52a381 + Вертикальный контейнер + true + false + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 3f217825-2344-4196-bd31-cf0b27c887a4 + AC_МЧД + false + false + + + + elseActions + + + + + + behavior + +{"objectId":"f47e3ad9-6065-41a7-862d-991c41f1bdfa","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + +{"objectId":"97a5367f-cc24-4d04-87c5-efaa5d9b7d0b","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + eventRefs + + + + + + behavior + +{"objectId":"17c7b00e-9ea7-47e8-a841-3c49fc24123b","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + propertyName + +"userChangeValueEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + +objectValue + + + + behavior - "btn-main" + {"objectId":"17c7b00e-9ea7-47e8-a841-3c49fc24123b","packageName":"component.field","className":"CheckBox","type":"TS"} - - - - - extensionFilter - - + + + method - "csv" + "getValue" - - - - - formType - - "FORM_11" - - - - maxFileSizeMb - - 5.0 - - - - maxFilesToUpload - - 1.0 - - - - removeFileButtonName - - "Удалить" - - - - selectFileButtonName - - "Выбрать" - - - - selectFileFieldText - - "Перетащите файл или выберите на компьютере" - - - - + + + + + + + + + conditionSecondPart + + + +staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + +{"objectId":"f47e3ad9-6065-41a7-862d-991c41f1bdfa","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + +{"objectId":"97a5367f-cc24-4d04-87c5-efaa5d9b7d0b","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + 17c7b00e-9ea7-47e8-a841-3c49fc24123b + Check box + false + false + + + + label + + null + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 780dba1a-b9a9-4a98-9bf0-40dc91577fb7 + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + initialValue + + "Внимание: если файл подписан не руководителем организации, рекомендуется приложить МЧД" + + + + + + + + +false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + a29b15a1-79b1-4dfa-ac78-223742ac2698 + Hbox + true + true + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + f47e3ad9-6065-41a7-862d-991c41f1bdfa + Мчд File + false + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "xml" + + + + + + formType + + "FORM_11" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + visible + + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 97a5367f-cc24-4d04-87c5-efaa5d9b7d0b + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - xml" + + + + visible + + false + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + dc182bde-6e42-4ddf-b83d-a5ca05a99cbd + Vbox + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + be915f17-da79-45f3-afe3-0fa6cac060f4 + Vbox + true + true + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e @@ -12040,7 +12975,25 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileAddedEvent" + + + + + + + + + + behavior + + {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -12061,6 +13014,108 @@ conditions + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + @@ -12140,7 +13195,25 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileDeletedEvent" + + + + + + + + + + behavior + + {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -12283,7 +13356,7 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -12311,33 +13384,7 @@ d4f96505-0b2a-4e7b-87c6-e79f1987da66 Текст false - false - - - - cssClasses - - - - "mute" - - - - - - initialValue - - "Поддерживаемый формат файла - csv" - - - - - - - - - false - + true fd7e47b9-dce1-4d14-9f3a-580c79f59579 @@ -12395,7 +13442,7 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -12632,6 +13679,251 @@ false + + + + + + + + + + + + behavior + + {"objectId":"e6baac95-674d-4833-8eaa-142ed5ed0f02","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"52a47dd7-0448-4934-aba0-72c95b93b091","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"17c7b00e-9ea7-47e8-a841-3c49fc24123b","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"780dba1a-b9a9-4a98-9bf0-40dc91577fb7","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"f47e3ad9-6065-41a7-862d-991c41f1bdfa","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"97a5367f-cc24-4d04-87c5-efaa5d9b7d0b","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + @@ -12661,7 +13953,7 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -12768,7 +14060,7 @@ behavior - {"objectId":"9c49eea1-7d04-4d99-b213-59aa51499acc","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d202441d-c2ae-4e34-970e-78166e8c4ea9","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} From 64cc5ff7a91b8c92ccb26e3c9fc86ae92d91a79a Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Wed, 15 Oct 2025 16:14:52 +0300 Subject: [PATCH 04/11] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=A1=D0=BE=D0=BB=D0=BE=D0=B2=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/micord/ervu/journal/JournalDto.java | 30 ++++-- .../micord/ervu/journal/JournalFileInfo.java | 10 ++ .../ervu/journal/mapper/JournalDtoMapper.java | 10 +- .../ervu/service/InteractionServiceImpl.java | 2 - .../business-model/Журнал взаимодействия.page | 92 ++++++++++++++++++- 5 files changed, 126 insertions(+), 18 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java b/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java index 6adc2e2f..c9caf0c6 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java +++ b/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java @@ -8,8 +8,9 @@ public class JournalDto { private Integer filePatternCode; private String senderFio; private String status; - public Integer filesSentCount; - public Integer acceptedFilesCount; + public Integer rowsCount; + public Integer rowsSuccess; + public Integer rowsError; public String getDepartureDateTime() { return departureDateTime; @@ -65,21 +66,30 @@ public class JournalDto { return this; } - public Integer getFilesSentCount() { - return filesSentCount; + public Integer getRowsCount() { + return rowsCount; } - public JournalDto setFilesSentCount(Integer filesSentCount) { - this.filesSentCount = filesSentCount; + public JournalDto setRowsCount(Integer rowsCount) { + this.rowsCount = rowsCount; return this; } - public Integer getAcceptedFilesCount() { - return acceptedFilesCount; + public Integer getRowsSuccess() { + return rowsSuccess; } - public JournalDto setAcceptedFilesCount(Integer acceptedFilesCount) { - this.acceptedFilesCount = acceptedFilesCount; + public JournalDto setRowsSuccess(Integer rowsSuccess) { + this.rowsSuccess = rowsSuccess; + return this; + } + + public Integer getRowsError() { + return rowsError; + } + + public JournalDto setRowsError(Integer rowsError) { + this.rowsError = rowsError; return this; } } diff --git a/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java b/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java index 6dc27a6e..7ffb5251 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java +++ b/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java @@ -14,6 +14,7 @@ public class JournalFileInfo { private SenderInfo senderInfo; private Integer rowsCount; //Общее количество записей отправленных в файле private Integer rowsSuccess; //Количество записей принятых в файле + private Integer rowsError; //Количество записей непринятых в файле public List getPackFiles() { return packFiles; @@ -51,6 +52,15 @@ public class JournalFileInfo { return this; } + public Integer getRowsError() { + return rowsError; + } + + public JournalFileInfo setRowsError(Integer rowsError) { + this.rowsError = rowsError; + return this; + } + @JsonIgnoreProperties(ignoreUnknown = true) public static class JournalFileDetails { private String fileId; //ИД файла полученный при создании записи о файле в реестр организаций (в ЕРВУ) diff --git a/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java b/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java index cbc144d9..332e1e28 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java +++ b/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java @@ -24,8 +24,9 @@ public class JournalDtoMapper { ) ) .setStatus(journalFileDetails.getFileStatus().getStatus()) - .setFilesSentCount(journalFileInfo.getRowsCount()) - .setAcceptedFilesCount(journalFileInfo.getRowsSuccess()); + .setRowsCount(journalFileInfo.getRowsCount()) + .setRowsSuccess(journalFileInfo.getRowsSuccess()) + .setRowsError(journalFileInfo.getRowsError()); } public static JournalDto mapToJournalDto(InteractionLogRecord record) { @@ -35,8 +36,9 @@ public class JournalDtoMapper { .setFilePatternCode(Integer.valueOf(record.getForm())) .setSenderFio(record.getSender()) .setStatus(record.getStatus()) - .setFilesSentCount(record.getRecordsSent()) - .setAcceptedFilesCount(record.getRecordsAccepted()) + .setRowsCount(0) + .setRowsSuccess(0) + .setRowsError(0) .setFileId(record.getFileId()); } } diff --git a/backend/src/main/java/ru/micord/ervu/service/InteractionServiceImpl.java b/backend/src/main/java/ru/micord/ervu/service/InteractionServiceImpl.java index c5688d16..b02c9e2c 100644 --- a/backend/src/main/java/ru/micord/ervu/service/InteractionServiceImpl.java +++ b/backend/src/main/java/ru/micord/ervu/service/InteractionServiceImpl.java @@ -41,8 +41,6 @@ public class InteractionServiceImpl implements InteractionService { .set(INTERACTION_LOG.SENT_DATE, timestamp) .set(INTERACTION_LOG.SENDER, sender) .set(INTERACTION_LOG.FILE_NAME, fileName) - .set(INTERACTION_LOG.RECORDS_SENT, 0) - .set(INTERACTION_LOG.RECORDS_ACCEPTED, 0) .set(INTERACTION_LOG.ERVU_ID, ervuId) .execute(); } diff --git a/resources/src/main/resources/business-model/Журнал взаимодействия.page b/resources/src/main/resources/business-model/Журнал взаимодействия.page index 714d98cf..aef15eb6 100644 --- a/resources/src/main/resources/business-model/Журнал взаимодействия.page +++ b/resources/src/main/resources/business-model/Журнал взаимодействия.page @@ -1489,7 +1489,7 @@ column - "filesSentCount" + "rowsCount" @@ -1577,7 +1577,95 @@ column - "acceptedFilesCount" + "rowsSuccess" + + + + filterType + + "NUMBER" + + + + type + + "java.lang.Number" + + + + + + + filter + +true + + + + sortable + +true + + + + width + +80 + + + + widthFixed + +null + + + + + + + c556264f-221b-4af8-9e64-f380a67c41ec + bc82586d-42e3-4155-b215-a1a8f455c0d7 + Записей непринято + false + false + + + + floatingFilter + +false + + + + + + + + autoHeight + +true + + + + displayName + +"Записей не принято" + + + + displayPopup + +true + + + + field + + + + column + + "rowsError" From 33c0a425175eb4e3c2a7ae1e1ff7f0d524535e7e Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Wed, 15 Oct 2025 16:15:55 +0300 Subject: [PATCH 05/11] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=A1=D0=BE=D0=BB=D0=BE=D0=B2=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=D0=B0=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/micord/ervu/journal/JournalDto.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java b/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java index c9caf0c6..69b15f19 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java +++ b/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java @@ -8,9 +8,9 @@ public class JournalDto { private Integer filePatternCode; private String senderFio; private String status; - public Integer rowsCount; - public Integer rowsSuccess; - public Integer rowsError; + private Integer rowsCount; + private Integer rowsSuccess; + private Integer rowsError; public String getDepartureDateTime() { return departureDateTime; From 20bee06813200c2f7d0ef6b5373ef51f75dd68f2 Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Wed, 15 Oct 2025 16:29:36 +0300 Subject: [PATCH 06/11] form 12 --- .../Личный кабинет юр лица.page | 1574 +++++++++++++++-- 1 file changed, 1443 insertions(+), 131 deletions(-) diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 3fc09859..60777fb8 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -3852,6 +3852,7 @@ 9138d81a-f635-42f6-915c-b3c7be4e2160 Группа полей true + false false @@ -12102,6 +12103,7 @@ 36ed9134-7e97-45ea-8215-261f65e69077 Вертикальный контейнер true + false false @@ -12307,6 +12309,7 @@ 40e1b3d6-57ff-4ef7-b93f-72e0c2661b70 Вертикальный контейнер true + false false @@ -12478,6 +12481,7 @@ cae94ea0-75e1-408a-8ad7-34a07b52a381 Вертикальный контейнер true + false false @@ -14164,7 +14168,6 @@ 991237d3-8cb9-48af-8501-030a3c8c6cfc Группа полей true - false false @@ -14195,6 +14198,7 @@ 754d7c80-d6f6-4d7f-a902-f5635d5dd60e Горизонтальный контейнер true + false false @@ -14487,6 +14491,7 @@ 025b7644-c658-49b2-a740-188668b8b81e Hbox_12 true + false false @@ -14663,6 +14668,7 @@ 7be4de32-b967-4629-9801-425457e4b9c5 Hbox_12_ true + false false @@ -14811,7 +14817,6 @@ fafbc151-0d60-4e80-90d1-501d426dadc9 Hbox true - false false @@ -14836,6 +14841,7 @@ f6310258-ec19-4d13-b04d-cfc09d6b5e77 Кнопка 5 false + false false @@ -15082,7 +15088,7 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -15117,7 +15123,7 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -15205,6 +15211,182 @@ + + + + + behavior + + {"objectId":"3db79e5b-7bea-4043-ab90-1080983f89d3","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"42e0e31c-1fc1-415f-9f4c-64fbd2ba0889","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"3808bc3e-cddf-4a55-b324-f4fe469e4938","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"da4bcc36-03cf-494d-9757-c3fc7486ef2f","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"d3bbecf6-acf6-468b-bb67-4b5549c44a58","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + @@ -15362,38 +15544,7 @@ d60694e9-0d17-4e07-ad1d-ad9871e3deaa Текст false - false - - - - cssClasses - - - - "subtitle" - - - - - - - - - - - initialValue - - "Ежегодное предоставление списка сотрудников/обучающихся в организации, подлежащих воинскому учету" - - - - - - - - - false - + true 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 @@ -15496,73 +15647,876 @@ 8f61be32-7f6c-40e3-afba-ad802f48a040 FileUploadV2 false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + f095d2a8-2f04-4aca-9fe0-14cda3343bb0 + Вертикальный контейнер + true false - - - - collectible - - false - - - - cssClasses - - + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d60694e9-0d17-4e07-ad1d-ad9871e3deaa + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Ежегодное предоставление списка сотрудников/обучающихся в организации, подлежащих воинскому учету" + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 8e71cf03-601f-46dd-bb10-baa4852390bc + Текст + false + true + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + 6f18b446-eb34-4894-92c8-6654e0380ef5 + Csv file + false + false + false + +false +true + + + + ErvuFileUploadWithAdditionalFiles + ervu.component.fileupload + +true +true + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + displayFileSize + + true + + + + displayProgressBar + + true + + + + extensionFilter + + + + "csv" + + + + + + + formType + + "FORM_12" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + mchdFileUploadRef + + {"objectId":"f47e3ad9-6065-41a7-862d-991c41f1bdfa","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + signFileUploadRef + + {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + visible + + true + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 159c7f1e-c71c-4da1-bf51-18550aa8baa4 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - csv" + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 9c6cdd62-01b8-47c2-a0a3-43a4b2a44183 + Текст + false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + b0903742-cbcd-4593-b98b-6055b71bb9ca + Вертикальный контейнер + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 64b7e42e-3501-4f93-8933-dfcbc75cb245 + Вертикальный контейнер + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 3db79e5b-7bea-4043-ab90-1080983f89d3 + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + + + + + + initialValue + + "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + + + + + + + + +false + + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + d3bbecf6-acf6-468b-bb67-4b5549c44a58 + Подпись File + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "sig" + + + + + + formType + + "FORM_12" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 42e0e31c-1fc1-415f-9f4c-64fbd2ba0889 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - sig" + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 47a8d746-1dc3-4237-ac8a-f395bed05493 + Вертикальный контейнер + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + a8c8be34-345b-42b4-a29a-499096a3e5af + Вертикальный контейнер + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 37859c01-1ec5-4557-8d56-31cf2702abda + Вертикальный контейнер + true + false + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + a8957fcd-8c8a-403c-b45f-2b8632bdf509 + AC_МЧД + false + false + + + + elseActions + + + + + + behavior + +{"objectId":"f0d9399b-fb2f-4874-a307-2006e7758f44","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + +{"objectId":"14da9d8b-7687-4f09-a423-626db4f3e749","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + eventRefs + + + + + + behavior + +{"objectId":"3808bc3e-cddf-4a55-b324-f4fe469e4938","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + propertyName + +"userChangeValueEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + +objectValue + + + + behavior - "btn-main" + {"objectId":"3808bc3e-cddf-4a55-b324-f4fe469e4938","packageName":"component.field","className":"CheckBox","type":"TS"} - - - - - extensionFilter - - + + + method - "csv" + "getValue" - - - - - formType - - "FORM_12" - - - - maxFileSizeMb - - 5.0 - - - - maxFilesToUpload - - 1.0 - - - - removeFileButtonName - - "Удалить" - - - - selectFileButtonName - - "Выбрать" - - - - selectFileFieldText - - "Перетащите файл или выберите на компьютере" - - - - + + + + + + + + + conditionSecondPart + + + +staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + +{"objectId":"f0d9399b-fb2f-4874-a307-2006e7758f44","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + +{"objectId":"14da9d8b-7687-4f09-a423-626db4f3e749","packageName":"component","className":"Text","type":"TS"} + + + + method + +"setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + 3808bc3e-cddf-4a55-b324-f4fe469e4938 + Check box + false + false + + + + label + + null + + + + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + da4bcc36-03cf-494d-9757-c3fc7486ef2f + Текст + false + false + + + + cssClasses + + + + "subtitle" + + + + + + initialValue + + "Внимание: если файл подписан не руководителем организации, рекомендуется приложить МЧД" + + + + + + + + +false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 085f831f-4df9-444b-b7fc-79b96e7f1f67 + Hbox + true + true + + + 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c + f0d9399b-fb2f-4874-a307-2006e7758f44 + Мчд File + false + false + false + + + + collectible + + false + + + + cssClasses + + + + "btn-main" + + + + + + extensionFilter + + + + + "xml" + + + + + + formType + + "FORM_12" + + + + maxFileSizeMb + + 5.0 + + + + maxFilesToUpload + + 1.0 + + + + removeFileButtonName + + "Удалить" + + + + selectFileButtonName + + "Выбрать" + + + + selectFileFieldText + + "Перетащите файл или выберите на компьютере" + + + + visible + + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 14da9d8b-7687-4f09-a423-626db4f3e749 + Текст + false + false + + + + cssClasses + + + + "mute" + + + + + + initialValue + + "Поддерживаемый формат файла - xml" + + + + visible + + false + + + + + + + + +false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 080a0c2f-b66c-4987-9cf7-80beb26edd1e + Vbox + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 51813a15-4d66-4b61-b522-e9e24b65b972 + Vbox + true + true + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e @@ -15587,7 +16541,25 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileAddedEvent" + + + + + + + + + + behavior + + {"objectId":"d3bbecf6-acf6-468b-bb67-4b5549c44a58","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -15608,6 +16580,108 @@ conditions + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"d3bbecf6-acf6-468b-bb67-4b5549c44a58","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + operation + + "IS_NOT_EMPTY" + + + + + + + + @@ -15687,7 +16761,25 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} + + + + propertyName + + "fileDeletedEvent" + + + + + + + + + + behavior + + {"objectId":"d3bbecf6-acf6-468b-bb67-4b5549c44a58","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -15830,7 +16922,7 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -15858,33 +16950,7 @@ 159c7f1e-c71c-4da1-bf51-18550aa8baa4 Текст false - false - - - - cssClasses - - - - "mute" - - - - - - initialValue - - "Поддерживаемый формат файла - csv" - - - - - - - - - false - + true fd7e47b9-dce1-4d14-9f3a-580c79f59579 @@ -15942,7 +17008,7 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -16179,6 +17245,252 @@ false + + + + + + + + + + + + behavior + + {"objectId":"3db79e5b-7bea-4043-ab90-1080983f89d3","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"d3bbecf6-acf6-468b-bb67-4b5549c44a58","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"42e0e31c-1fc1-415f-9f4c-64fbd2ba0889","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"3808bc3e-cddf-4a55-b324-f4fe469e4938","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"f0d9399b-fb2f-4874-a307-2006e7758f44","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + + behavior + + {"objectId":"da4bcc36-03cf-494d-9757-c3fc7486ef2f","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"14da9d8b-7687-4f09-a423-626db4f3e749","packageName":"component","className":"Text","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + @@ -16208,7 +17520,7 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} @@ -16315,7 +17627,7 @@ behavior - {"objectId":"8f61be32-7f6c-40e3-afba-ad802f48a040","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"6f18b446-eb34-4894-92c8-6654e0380ef5","packageName":"ervu.component.fileupload","className":"ErvuFileUploadWithAdditionalFiles","type":"TS"} From 9a9ff4930f0b1d634846ab34db6b379c6cd39c5a Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Thu, 16 Oct 2025 14:57:23 +0300 Subject: [PATCH 07/11] fix text --- .../Личный кабинет юр лица.page | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 60777fb8..20507167 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -1439,7 +1439,7 @@ initialValue - "Перед выбором файла убедитесь, что все данные в файле введены корректно. \u003cbr\u003eФайл подписан усиленной квалифицированной электронной подписью." + "Перед выбором файла убедитесь, что все данные в файле введены корректно. \u003cbr\u003eФайл подписан электронной подписью." @@ -1892,7 +1892,7 @@ initialValue - "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + "Ваша откреплённая электронная подпись в формате sig" @@ -4988,7 +4988,7 @@ initialValue - "Перед выбором файла убедитесь, что все данные в файле введены корректно" + "Перед выбором файла убедитесь, что все данные в файле введены корректно. \u003cbr\u003eФайл подписан электронной подписью." @@ -5445,7 +5445,7 @@ initialValue - "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + "Ваша откреплённая электронная подпись в формате sig" @@ -8385,7 +8385,7 @@ initialValue - "Перед выбором файла убедитесь, что все данные в файле введены корректно" + "Перед выбором файла убедитесь, что все данные в файле введены корректно. \u003cbr\u003eФайл подписан электронной подписью." @@ -8863,7 +8863,7 @@ initialValue - "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + "Ваша откреплённая электронная подпись в формате sig" @@ -11876,7 +11876,7 @@ initialValue - "Перед выбором файла убедитесь, что все данные в файле введены корректно" + "Перед выбором файла убедитесь, что все данные в файле введены корректно. \u003cbr\u003eФайл подписан электронной подписью." @@ -12342,7 +12342,7 @@ initialValue - "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + "Ваша откреплённая электронная подпись в формате sig" @@ -15427,7 +15427,7 @@ initialValue - "Перед выбором файла убедитесь, что все данные в файле введены корректно" + "Перед выбором файла убедитесь, что все данные в файле введены корректно. \u003cbr\u003eФайл подписан электронной подписью." @@ -15905,7 +15905,7 @@ initialValue - "Ваша открепленная усиленная квалифицированная электронная подпись в формате sig" + "Ваша откреплённая электронная подпись в формате sig" @@ -18378,4 +18378,4 @@ - + \ No newline at end of file From 19c3b69aa906f87e710e44444e14cecb6c332476 Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Thu, 16 Oct 2025 15:29:47 +0300 Subject: [PATCH 08/11] fix --- .../EmployeeInfoFileUploadService.java | 6 +- .../Личный кабинет юр лица.page | 73 +++---------------- 2 files changed, 13 insertions(+), 66 deletions(-) diff --git a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java index b7952719..974e4384 100644 --- a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java +++ b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java @@ -343,8 +343,7 @@ public class EmployeeInfoFileUploadService { new FileInfo[] {fileInfo, signFileInfo}, fileInfo.getFileStatus() ); try { - sendMessage(fileStatusResponse); - return true; + return sendMessage(fileStatusResponse); } catch (JsonProcessingException e) { handeSignError(fileInfo, signFileInfo, uploadOrgInfo, response); @@ -367,8 +366,7 @@ public class EmployeeInfoFileUploadService { ); interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); - sendMessage(fileStatusResponse); - return true; + return sendMessage(fileStatusResponse); } catch (JsonProcessingException e) { handleMchdValidationError(uploadOrgInfo, fileInfo, signFileInfo, mchdFileInfo, ervuId, response diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 20507167..0379756f 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -5245,13 +5245,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - dbb46f04-0f9b-42bc-8a85-2b8b8dc7c246 - Текст - false - true - 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c f8c09ec6-d52a-4398-a40e-a237f4305b88 @@ -5367,13 +5360,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - a3c544ce-f22e-4d7c-a879-4827832742f8 - Текст - false - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 0970e79a-7130-4c23-bdc8-13f8554daa59 @@ -7271,13 +7257,6 @@ - - 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a - 89bcd110-0dc0-4aaa-9a4f-172858b2ce03 - Диалог - выбор файла и отправка - true - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 b50c6499-5c81-4fc3-b9ce-02cc1124e673 @@ -7806,13 +7785,6 @@ - - 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a - b59b46f5-0b45-4a0e-99d9-1eed7060be97 - Диалог - выбор файла и отправка НОВЫЙ - true - true - e32ae1f5-5b14-45f1-abb6-f52c34b3b570 aa0a8f53-5fdb-4c6c-b364-008e09088c3a @@ -8656,13 +8628,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - b93c1470-2577-4be2-ba77-4081940486ce - Текст - false - true - 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c 3d0d0314-ea5f-4974-a92d-32c11ce90861 @@ -8811,13 +8776,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 1bb8f548-1b8e-4bda-b265-0ed6fce660e8 - Текст - false - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 276d7e73-eba9-4859-942f-af19f7ff535f @@ -10748,6 +10706,7 @@ 7057bbcb-cff2-4e31-812d-ba7e043a4bcc Группа полей true + false false @@ -12103,7 +12062,6 @@ 36ed9134-7e97-45ea-8215-261f65e69077 Вертикальный контейнер true - false false @@ -12309,7 +12267,6 @@ 40e1b3d6-57ff-4ef7-b93f-72e0c2661b70 Вертикальный контейнер true - false false @@ -12481,7 +12438,6 @@ cae94ea0-75e1-408a-8ad7-34a07b52a381 Вертикальный контейнер true - false false @@ -13945,6 +13901,7 @@ d31780d3-6bdf-4fea-b297-5405f122b0ad Обработка событий - end file upload false + false false @@ -14052,6 +14009,7 @@ 359f50fe-e079-435c-8844-efcf652c9313 Обработка событий - failed file upload false + false false @@ -14168,6 +14126,7 @@ 991237d3-8cb9-48af-8501-030a3c8c6cfc Группа полей true + false false @@ -15698,13 +15657,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8e71cf03-601f-46dd-bb10-baa4852390bc - Текст - false - true - 5694e7c5-bbb5-4d23-be6c-7ad71b8ad38c 6f18b446-eb34-4894-92c8-6654e0380ef5 @@ -15784,7 +15736,7 @@ mchdFileUploadRef - {"objectId":"f47e3ad9-6065-41a7-862d-991c41f1bdfa","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"f0d9399b-fb2f-4874-a307-2006e7758f44","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -15808,7 +15760,7 @@ signFileUploadRef - {"objectId":"f4ef5c50-9c44-4165-bcdf-5b6e7f4aaab1","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} + {"objectId":"d3bbecf6-acf6-468b-bb67-4b5549c44a58","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"} @@ -15853,13 +15805,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 9c6cdd62-01b8-47c2-a0a3-43a4b2a44183 - Текст - false - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 b0903742-cbcd-4593-b98b-6055b71bb9ca @@ -16743,6 +16688,7 @@ f897626f-4c10-4648-90fe-51b6f9b31fe9 Обработка событий - файл удален false + false false @@ -16996,6 +16942,7 @@ 09000d10-0142-4051-9ab8-0df98bd5dafa Обработка событий - start file upload false + false false @@ -17508,6 +17455,7 @@ e80f8dec-8222-4b94-bc94-e8b2119dfca1 Обработка событий - end file upload false + false false @@ -17615,6 +17563,7 @@ 6745088f-5c87-42e6-bc87-41efba248455 Обработка событий - failed file upload false + false false @@ -18378,4 +18327,4 @@ - \ No newline at end of file + From 2118f96c26cbf0a0d1ee82a5b82c4bcbc52141f4 Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Thu, 16 Oct 2025 16:07:10 +0300 Subject: [PATCH 09/11] SUPPORT-9339: Fix status --- .../EmployeeInfoFileUploadService.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java index 974e4384..6e33d84b 100644 --- a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java +++ b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java @@ -338,12 +338,18 @@ public class EmployeeInfoFileUploadService { signerInfoMap.get("O").equalsIgnoreCase(uploadOrgInfo.getOrgName()); if (isSignerValid) { - interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); FileStatusResponse fileStatusResponse = new FileStatusResponse(uploadOrgInfo, new FileInfo[] {fileInfo, signFileInfo}, fileInfo.getFileStatus() ); try { - return sendMessage(fileStatusResponse); + if (sendMessage(fileStatusResponse)) { + interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); + return true; + } + else { + interactionService.delete(fileInfo.getFileId(), ervuId); + return false; + } } catch (JsonProcessingException e) { handeSignError(fileInfo, signFileInfo, uploadOrgInfo, response); @@ -364,9 +370,15 @@ public class EmployeeInfoFileUploadService { validateMchd(mchdFile, accessToken, signerInfoMap.get("SN") + " " + signerInfoMap.get("G"), chiefFirstName, chiefLastName, chiefMiddleName ); - interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); - return sendMessage(fileStatusResponse); + if (sendMessage(fileStatusResponse)) { + interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); + return true; + } + else { + interactionService.delete(fileInfo.getFileId(), ervuId); + return false; + } } catch (JsonProcessingException e) { handleMchdValidationError(uploadOrgInfo, fileInfo, signFileInfo, mchdFileInfo, ervuId, response From ceb6a6ee43aff1609d1b569a2b31ca44b18e3c96 Mon Sep 17 00:00:00 2001 From: Eduard Tihomiorv Date: Fri, 17 Oct 2025 09:54:58 +0300 Subject: [PATCH 10/11] fix status packInfo --- .../java/ru/micord/ervu/journal/JournalFileInfo.java | 10 ++++++++++ .../micord/ervu/journal/mapper/JournalDtoMapper.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java b/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java index 7ffb5251..410a8e74 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java +++ b/backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java @@ -11,6 +11,7 @@ import ru.micord.ervu.journal.deserializer.DepartureDateTimeDeserializer; public class JournalFileInfo { private List packFiles; // Список файлов (csv, sig, mchd) + private JournalFileStatus packInfo; //общий статус по пакету private SenderInfo senderInfo; private Integer rowsCount; //Общее количество записей отправленных в файле private Integer rowsSuccess; //Количество записей принятых в файле @@ -61,6 +62,15 @@ public class JournalFileInfo { return this; } + public JournalFileStatus getPackInfo() { + return packInfo; + } + + public JournalFileInfo setPackInfo(JournalFileStatus packInfo) { + this.packInfo = packInfo; + return this; + } + @JsonIgnoreProperties(ignoreUnknown = true) public static class JournalFileDetails { private String fileId; //ИД файла полученный при создании записи о файле в реестр организаций (в ЕРВУ) diff --git a/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java b/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java index 332e1e28..f76f0941 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java +++ b/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java @@ -23,7 +23,7 @@ public class JournalDtoMapper { senderInfo.getLastName() ) ) - .setStatus(journalFileDetails.getFileStatus().getStatus()) + .setStatus(journalFileInfo.getPackInfo().getStatus()) .setRowsCount(journalFileInfo.getRowsCount()) .setRowsSuccess(journalFileInfo.getRowsSuccess()) .setRowsError(journalFileInfo.getRowsError()); From 5b36227437eb6ae7a85e3f9f73c463849120af8c Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Wed, 8 Oct 2025 13:46:02 +0300 Subject: [PATCH 11/11] ERVU-587 --- .../main/resources/business-model/Личный кабинет юр лица.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 0379756f..eb8f7f58 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -331,7 +331,7 @@ tooltip - "Сведения о гражданине, подлежащем воинскому учету, и принятии (поступлении его на работу в образовательную организацию) или увольнении (отчислении) его с работы (из образовательной организации)" + "Сведения о гражданине, подлежащем воинскому учету, и принятии (поступлении) его на работу (в образовательную организацию) или увольнении (отчислении) его с работы (из образовательной организации)"