diff --git a/resources/src/main/resources/business-model/main_process/main_page.page b/resources/src/main/resources/business-model/main_process/main_page.page
index a882bfd..e523bca 100644
--- a/resources/src/main/resources/business-model/main_process/main_page.page
+++ b/resources/src/main/resources/business-model/main_process/main_page.page
@@ -59,6 +59,7 @@
8497ae79-a2e4-4c50-aac1-b7a6c522d104
Исключение из списков на вызов
true
+ false
false
@@ -897,7 +898,7 @@
69af9ec9-d640-499a-bf05-cda6ce64a81f
8774a5c6-06b6-4cfc-b325-6f92ec3cb03a
- IDs_exclude
+ ИД ЕРН_exclude
false
false
@@ -929,7 +930,7 @@
label
-"IDs"
+"ИД ЕРН"
@@ -954,6 +955,288 @@
false
+
+ 57c7cd21-1556-4dbd-b9da-33520486a1db
+ ed949b89-2fc3-4adc-b299-b327787300f0
+ SQL Получить ИД ЕРВУ граждан del
+ false
+ false
+
+
+
+ caption
+
+"Получить ИД ЕРВУ граждан"
+
+
+
+
+
+
+
+ queryParams
+
+-
+
+
+
+ objectValue
+
+
+
+ argument
+
+null
+
+
+
+ behavior
+
+{"objectId":"8774a5c6-06b6-4cfc-b325-6f92ec3cb03a","packageName":"component.field","className":"TextArea","type":"TS"}
+
+
+
+ method
+
+"getValue"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ executeSqlButtonService
+
+
+
+ jndiName
+
+ "java:/webbpm/personRegistryDS"
+
+
+
+ sql
+
+ "select \u0027{\u0027||string_agg(\u0027\"\u0027||id::text||\u0027\"\u0027,\u0027,\u0027)||\u0027}\u0027\nfrom recruits\nwhere system_id_ern \u003d any(string_to_array(trim(trailing \u0027,\u0027 from replace(replace(\u0027\u0027,chr(13),\u0027\u0027),chr(10),\u0027,\u0027)),\u0027,\u0027))"
+
+
+
+
+
+
+
+
+
+ 69af9ec9-d640-499a-bf05-cda6ce64a81f
+ 663b3639-2a6b-4f3d-b0a0-2ba829de6ea4
+ ИД ЕРВУ удаляемых граждан_delete
+ false
+ false
+
+
+
+ cssClasses
+
+-
+
+ "width-full"
+
+
+
+
+
+ errorTooltipStyle
+
+
+
+ height
+
+ null
+
+
+
+false
+
+
+
+ label
+
+"ИД ЕРВУ граждан для удаления"
+
+
+
+ style
+
+
+
+ height
+
+ "500px"
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SaveValueToVariable
+ modules.bpmn.script
+
+ true
+ true
+
+
+ variable
+
+"delete_ids_string"
+
+
+
+
+
+
+ 98594cec-0a9b-4cef-af09-e1b71cb2ad9e
+ 54bb74bc-2c3e-4d55-be86-c2d863db14f4
+ AC_get_id
+ false
+ false
+
+
+
+ eventRefs
+
+-
+
+
+
+ behavior
+
+ {"objectId":"ed949b89-2fc3-4adc-b299-b327787300f0","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}
+
+
+
+ propertyName
+
+ "clickEvent"
+
+
+
+
+
+
+
+
+ ifCondition
+
+
+
+ logicalOperation
+
+ null
+
+
+
+
+
+
+ thenActions
+
+-
+
+
+
+ behavior
+
+ {"objectId":"663b3639-2a6b-4f3d-b0a0-2ba829de6ea4","packageName":"component.field","className":"TextArea","type":"TS"}
+
+
+
+ method
+
+ "setValue"
+
+
+
+ value
+
+
+
+ objectValue
+
+
+
+ argument
+
+ null
+
+
+
+ behavior
+
+ {"objectId":"ed949b89-2fc3-4adc-b299-b327787300f0","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}
+
+
+
+ method
+
+ "getResult"
+
+
+
+
+
+
+
+
+
+
+
+-
+
+ "delete_ids_string"
+
+
+
+
+
+ sql
+
+ "-- Author: Вышинская Виктория\n-- Change: Тестирование стенда\n-- Description: удаление сущностей гражданина из БД ervu_incidents\n\nDO\n$$\n DECLARE\n var1 uuid[] :\u003d \u0027?\u0027;\n BEGIN\n DELETE\n FROM incident_history\n where incident_id in (select id from incident where recruit_id \u003d any (var1));\n DELETE FROM incident where recruit_id \u003d any (var1);\n DELETE FROM recruits where id \u003d any (var1);\n END\n$$;\n"
+
+
+
+
+
+
+ _BF21F32F-D703-423C-A722-C2BF5F2810D7
+
+
+ ListSqlHandler
+ bpmn.handler.sql_handler
+
+ true
+
+
+ datasourceJndiName
+
+ "java:/webbpm/gepsNotifDS"
+
+
+
+ parameterVariables
+
+ -
+
+ "delete_ids_string"
+
+
+
+
+
+ sql
+
+ "-- Author: Вышинская Виктория\n-- Change: Тестирование стенда\n-- Description: удаление гражданина из БД ervu_geps_notifications\n\nDO\n$$\n DECLARE\n var1 uuid[] :\u003d \u0027?\u0027;\n BEGIN\n DELETE FROM notifications where recruit_id \u003d any (var1);\n END\n$$;"
+
+
+
+
+
+
+ _75BF8DBE-29C2-437C-AD2A-8EB0B5A31965
+
+
+ ListSqlHandler
+ bpmn.handler.sql_handler
+
+ true
+
+
+ datasourceJndiName
+
+ "java:/webbpm/summonListRegistryDS"
+
+
+
+ parameterVariables
+
+ -
+
+ "delete_ids_string"
+
+
+
+
+
+ sql
+
+ "-- Author: Вышинская Виктория\n-- Change: Тестирование стенда\n-- Description: удаление гражданина из БД ervu-journal\n\nDO\n$$\n DECLARE\n recruitIds uuid[] :\u003d \u0027?\u0027;\n importIds uuid[] :\u003d ARRAY(SELECT import_id\n FROM import_results\n WHERE recruit_id \u003d ANY (recruitIds));\n BEGIN\n WITH ImportDeletes AS (DELETE FROM import_journal_start WHERE import_id \u003d ANY (importIds) RETURNING journal_id)\n DELETE\n FROM journal\n WHERE id IN (SELECT journal_id FROM ImportDeletes);\n DELETE FROM import_journal_finish WHERE import_id \u003d ANY (importIds);\n DELETE FROM import_events_journal WHERE import_id \u003d ANY (importIds);\n DELETE FROM import_validation_errors WHERE import_id \u003d ANY (importIds);\n DELETE FROM import_results WHERE import_id \u003d ANY (importIds);\n DELETE FROM uploaded_files WHERE extra_info -\u003e\u003e \u0027importId\u0027 \u003d ANY (importIds::text[]);\n DELETE FROM object_history WHERE object_id \u003d ANY (recruitIds);\n DELETE FROM object_versions WHERE object_id \u003d ANY (recruitIds);\n END\n$$; \n"
+
+
+
+
+
+
+ _9639FD50-F761-4963-ADBF-8397C2D41D06
+
+
+ ListSqlHandler
+ bpmn.handler.sql_handler
+
+ true
+
+
+ datasourceJndiName
+
+ "java:/webbpm/subpoenaDS"
+
+
+
+ parameterVariables
+
+ -
+
+ "delete_ids_string"
+
+
+
+
+
+ sql
+
+ "-- Description: удаление данных и гражданина из БД ervu-subpoena-registry\nDO\n$$\n DECLARE\n var1 uuid[] :\u003d \u0027?\u0027;\n BEGIN\n DELETE FROM subpoena_history where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1));\n DELETE FROM subpoena_appearance where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1));\n\t\tDELETE FROM subpoena_send_info where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1));\n \n\t\tDELETE FROM notification_item where restriction_document_item_id in (\n\t\t\tselect id from restriction_document_item where restriction_document_create_id in (\n\t\t\tselect id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1))));\n\t\tDELETE FROM notification_item where restriction_document_item_id in (\n\t\t\tselect id from restriction_document_item where restriction_document_cancel_id in (\n\t\t\tselect id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1)))); \n\t\t\n\t\tDELETE FROM restriction_document_item_history WHERE recruit_id \u003d any (var1);\n DELETE FROM restriction_document_item where restriction_document_create_id in (\n\t\t\tselect id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1)));\n DELETE FROM restriction_document_item where restriction_document_cancel_id in (\n select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1)));\n DELETE FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id \u003d any (var1));\n DELETE FROM subpoena where recruit_id \u003d any (var1);\n\t\tDELETE FROM recruits WHERE id \u003d any (var1);\n END\n$$;"
+
+
+
+
+
+
+ _01A2D763-A7F7-4E2E-9526-C60319FD2C30
+
+
+ ListSqlHandler
+ bpmn.handler.sql_handler
+
+ true
+
+
+ datasourceJndiName
+
+ "java:/webbpm/summonListRegistryDS"
+
+
+
+ parameterVariables
+
+ -
+
+ "exclude_ids_string"
+
+
+ -
+
+ "exclude_ids_string"
+
+
+
+
+
+ sql
+
+ "update recruits set system_pgs_status \u003d \u00271.2\u0027 where id \u003d any (?);"
+
+
+
+
+
_081ED5EC-2AAE-48A5-AD60-79D347DA46FA
@@ -44,7 +251,7 @@
sql
- "update recruits\nset current_recruitment_id \u003d nullif(trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027cur\u0027)::text),\u0027null\u0027)::uuid\n\t,target_recruitment_id \u003d nullif(trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027trg\u0027)::text),\u0027null\u0027)::uuid\n\t,department_id_old \u003d nullif(trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027dio\u0027)::text),\u0027null\u0027)::uuid\n\t,system_pgs_status \u003d trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027st\u0027)::text)\n\t,extra_info \u003djsonb_strip_nulls(jsonb_set(extra_info, \u0027{blocked}\u0027,\u0027null\u0027))\nwhere id \u003d any (SELECT UNNEST (ARRAY_REMOVE(ARRAY [?], NULL)));"
+ "update recruits\nset current_recruitment_id \u003d nullif(trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027cur\u0027)::text),\u0027null\u0027)::uuid\n\t,target_recruitment_id \u003d nullif(trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027trg\u0027)::text),\u0027null\u0027)::uuid\n\t,department_id_old \u003d nullif(trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027dio\u0027)::text),\u0027null\u0027)::uuid\n\t,system_pgs_status \u003d trim (both \u0027\"\u0027 from (extra_info-\u003e\u0027blocked\u0027-\u003e\u0027st\u0027)::text)\n\t,extra_info \u003djsonb_strip_nulls(jsonb_set(extra_info, \u0027{blocked}\u0027,\u0027null\u0027))\nwhere id \u003d any(\u0027?\u0027)"
@@ -113,7 +320,7 @@
sql
- "-- ervu_person_registry_recruits_блокировка_рекрута_в_13.txt\nupdate recruits\nset current_recruitment_id \u003d \u0027891ad9d6-9e86-4a19-94a8-3459368e31b7\u0027\n\t,target_recruitment_id \u003d \u0027891ad9d6-9e86-4a19-94a8-3459368e31b7\u0027\n\t,department_id_old \u003d \u0027891ad9d6-9e86-4a19-94a8-3459368e31b7\u0027\n\t,system_pgs_status \u003d \u002713\u0027\n\t,extra_info \u003d jsonb_insert(coalesce(extra_info,\u0027{}\u0027::jsonb), \u0027{blocked}\u0027, \n\t(\u0027{\"cur\":\u0027|| coalesce(\u0027\"\u0027||current_recruitment_id::text||\u0027\"\u0027,\u0027null\u0027)||\n\t \u0027,\"trg\":\u0027|| coalesce(\u0027\"\u0027||target_recruitment_id::text||\u0027\"\u0027,\u0027null\u0027)||\n\t \u0027,\"dio\":\u0027|| coalesce(\u0027\"\u0027||department_id_old::text||\u0027\"\u0027,\u0027null\u0027)||\n\t \u0027,\"st\":\u0027|| coalesce(\u0027\"\u0027||system_pgs_status::text||\u0027\"\u0027,\u0027null\u0027)||\u0027}\u0027)::jsonb\n\t)\nwhere id \u003d any (SELECT UNNEST (ARRAY_REMOVE(ARRAY [?], NULL)));"
+ "update recruits\nset current_recruitment_id \u003d \u0027891ad9d6-9e86-4a19-94a8-3459368e31b7\u0027\n\t,target_recruitment_id \u003d \u0027891ad9d6-9e86-4a19-94a8-3459368e31b7\u0027\n\t,department_id_old \u003d \u0027891ad9d6-9e86-4a19-94a8-3459368e31b7\u0027\n\t,system_pgs_status \u003d \u002713\u0027\n\t,extra_info \u003d jsonb_insert(coalesce(extra_info,\u0027{}\u0027::jsonb), \u0027{blocked}\u0027, \n\t(\u0027{\"cur\":\u0027|| coalesce(\u0027\"\u0027||current_recruitment_id::text||\u0027\"\u0027,\u0027null\u0027)||\n\t \u0027,\"trg\":\u0027|| coalesce(\u0027\"\u0027||target_recruitment_id::text||\u0027\"\u0027,\u0027null\u0027)||\n\t \u0027,\"dio\":\u0027|| coalesce(\u0027\"\u0027||department_id_old::text||\u0027\"\u0027,\u0027null\u0027)||\n\t \u0027,\"st\":\u0027|| coalesce(\u0027\"\u0027||system_pgs_status::text||\u0027\"\u0027,\u0027null\u0027)||\u0027}\u0027)::jsonb\n\t)\nwhere id \u003d any(\u0027?\u0027);"
@@ -142,52 +349,20 @@
"lock_ids_string"
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
+ -
-
- "lock_ids_string"
-
-
+ -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
- -
-
- "lock_ids_string"
-
-
+ -
-
- "exclude_ids_string"
-
-
- -
-
- "exclude_ids_string"
-
-
- -
-
- "exclude_ids_string"
-
-
- -
-
- "exclude_ids_string"
-
-
-
-
-
- sql
-
- "-- 003-ervu_summon_list_registry-delete-without_recruit \n DELETE FROM summoned_list where recruit_id \u003d any (SELECT UNNEST (ARRAY_REMOVE(ARRAY [?], NULL)));\n DELETE FROM recruit_active_list where recruit_id \u003d any (SELECT UNNEST (ARRAY_REMOVE(ARRAY [?], NULL)));\n DELETE FROM documents where recruit_id \u003d any (SELECT UNNEST (ARRAY_REMOVE(ARRAY [?], NULL)));\n DELETE FROM subpoena where recruit_id \u003d any (SELECT UNNEST (ARRAY_REMOVE(ARRAY [?], NULL)));"
-
-
-
-
-
-
- _F80FBCEB-B0E4-45E0-9965-320FF229F45B
-
-
- ListSqlHandler
- bpmn.handler.sql_handler
-
- true
-
-
- datasourceJndiName
-
- "java:/webbpm/summonListRegistryDS"
-
-
-
- parameterVariables
-
- -
-
- "exclude_ids_string"
-
-
-
-
-
- sql
-
- "-- ervu_person_registry_recruits_перевод_граждан_в_статус_стоящих_на.sql\nupdate recruits set system_pgs_status \u003d \u00271.2\u0027 where id \u003d any (SELECT UNNEST (ARRAY_REMOVE(ARRAY [?], NULL)));"
+ "-- Author: Вышинская Виктория\n-- Change: Тестирование стенда\n-- Description: удаление гражданина из БД ervu-journal\n\nDO\n$$\n DECLARE\n recruitIds uuid[] :\u003d \u0027?\u0027;\n importIds uuid[] :\u003d ARRAY(SELECT import_id\n FROM import_results\n WHERE recruit_id \u003d ANY (recruitIds));\n BEGIN\n WITH ImportDeletes AS (DELETE FROM import_journal_start WHERE import_id \u003d ANY (importIds) RETURNING journal_id)\n DELETE\n FROM journal\n WHERE id IN (SELECT journal_id FROM ImportDeletes);\n DELETE FROM import_journal_finish WHERE import_id \u003d ANY (importIds);\n DELETE FROM import_events_journal WHERE import_id \u003d ANY (importIds);\n DELETE FROM import_validation_errors WHERE import_id \u003d ANY (importIds);\n DELETE FROM import_results WHERE import_id \u003d ANY (importIds);\n DELETE FROM uploaded_files WHERE extra_info -\u003e\u003e \u0027importId\u0027 \u003d ANY (importIds::text[]);\n DELETE FROM object_history WHERE object_id \u003d ANY (recruitIds);\n DELETE FROM object_versions WHERE object_id \u003d ANY (recruitIds);\n END\n$$; \n"
diff --git a/resources/src/main/resources/config/svg/_8b788e75-0f84-4511-8517-d9f24e29556d.svg b/resources/src/main/resources/config/svg/_8b788e75-0f84-4511-8517-d9f24e29556d.svg
index c94c03f..d65770a 100644
--- a/resources/src/main/resources/config/svg/_8b788e75-0f84-4511-8517-d9f24e29556d.svg
+++ b/resources/src/main/resources/config/svg/_8b788e75-0f84-4511-8517-d9f24e29556d.svg
@@ -1,127 +1,183 @@
-
\ No newline at end of file