diff --git a/config-data-executor/config-examples/block.xml b/config-data-executor/config-examples/block.xml index 8a01038..67d7586 100644 --- a/config-data-executor/config-examples/block.xml +++ b/config-data-executor/config-examples/block.xml @@ -6,9 +6,9 @@ $$ begin update recruits - set current_recruitment_id = 'ИДЕНТИФИКАТОР ТЕСТОВОГО ВК' - ,target_recruitment_id = 'ИДЕНТИФИКАТОР ТЕСТОВОГО ВК' - ,department_id_old = 'ИДЕНТИФИКАТОР ТЕСТОВОГО ВК' + set current_recruitment_id = '812228fe-42d3-4094-9508-2d1ca2739de8' + ,target_recruitment_id = '812228fe-42d3-4094-9508-2d1ca2739de8' + ,department_id_old = '812228fe-42d3-4094-9508-2d1ca2739de8' ,system_pgs_status = '13' ,extra_info = jsonb_set(coalesce(extra_info,'{}'::jsonb), '{blocked}', ('{"cur":'|| coalesce('"'||current_recruitment_id::text||'"','null')|| @@ -29,7 +29,7 @@ org.postgresql.Driver org.postgresql.xa.PGXADataSource 15 - summon-list-registry + person_registry @@ -131,7 +131,7 @@ DO $$ DECLARE - recruitIds uuid[] := '{${endpointArguments}}'; + recruitIds uuid[] := ${endpointArguments}; importIds uuid[] := ARRAY(SELECT import_id FROM import_results WHERE recruit_id = ANY (recruitIds)); diff --git a/config-data-executor/config-examples/removeFromSystem.xml b/config-data-executor/config-examples/removeFromSystem.xml index 230f728..4ff8b7f 100644 --- a/config-data-executor/config-examples/removeFromSystem.xml +++ b/config-data-executor/config-examples/removeFromSystem.xml @@ -77,7 +77,7 @@ DO $$ DECLARE - recruitIds uuid[] := '{${endpointArguments}}'; + recruitIds uuid[] := ${endpointArguments}; importIds uuid[] := ARRAY(SELECT import_id FROM import_results WHERE recruit_id = ANY (recruitIds)); diff --git a/config-data-executor/src/main/java/org/micord/service/RequestService.java b/config-data-executor/src/main/java/org/micord/service/RequestService.java index af21050..ec33682 100644 --- a/config-data-executor/src/main/java/org/micord/service/RequestService.java +++ b/config-data-executor/src/main/java/org/micord/service/RequestService.java @@ -150,12 +150,14 @@ public class RequestService { private Map buildSqlQuery(SqlRequest request, List ids) { Map resultMap = new HashMap<>(); String endpointArguments = ids.stream() - .map(id -> "'" + id.trim() + "'") + .map(String::trim) .collect(Collectors.joining(", ")); String requestURL = request.getRequestURL(); - if (!requestURL.contains("uuid[]")) { + if (requestURL.contains(":=")) { + endpointArguments = "'{" + endpointArguments + "}'"; + } else { endpointArguments = "(" + endpointArguments + ")"; } diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index b7cab5f..c9e012f 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -219,10 +219,6 @@ executeSqlButtonService - - ReadOnlySqlButtonServiceImpl - ru.micord.ervu_secret.component.service - jndiName @@ -237,6 +233,10 @@ + + ReadOnlySqlButtonServiceImpl + ru.micord.ervu_secret.component.service + @@ -672,10 +672,6 @@ executeSqlButtonService - - ReadOnlySqlButtonServiceImpl - ru.micord.ervu_secret.component.service - jndiName @@ -690,6 +686,10 @@ + + ReadOnlySqlButtonServiceImpl + ru.micord.ervu_secret.component.service + @@ -1125,10 +1125,6 @@ executeSqlButtonService - - ReadOnlySqlButtonServiceImpl - ru.micord.ervu_secret.component.service - jndiName @@ -1143,6 +1139,10 @@ + + ReadOnlySqlButtonServiceImpl + ru.micord.ervu_secret.component.service + @@ -1540,6 +1540,269 @@ + + 57c7cd21-1556-4dbd-b9da-33520486a1db + 01dd02ec-9ea9-4828-864e-e943d30c3de2 + SQL Получить ИД ЕРВУ граждан unlock + false + false + + + + caption + +"Получить ИД ЕРВУ граждан" + + + + + + + + queryParams + + + + + + objectValue + + + + argument + +null + + + + behavior + +{"objectId":"8c85fe31-bdb8-495e-8c4c-7addc9d7ba71","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(replace (?, \u0027\\n\u0027, E\u0027\\n\u0027),chr(13),\u0027\u0027),chr(10),\u0027,\u0027)),\u0027,\u0027))" + + + + + ReadOnlySqlButtonServiceImpl + ru.micord.ervu_secret.component.service + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + fc0a9292-6c2a-4d35-92be-bff120abb130 + AC_get_id + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"01dd02ec-9ea9-4828-864e-e943d30c3de2","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"} + + + + propertyName + + "clickEvent" + + + + + + + + + ifCondition + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + + {"objectId":"f38593fe-f55f-4fa9-b438-59ab39b03035","packageName":"component.field","className":"TextArea","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"01dd02ec-9ea9-4828-864e-e943d30c3de2","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"} + + + + method + + "getResult" + + + + + + + + + + + + + + + + + + + 69af9ec9-d640-499a-bf05-cda6ce64a81f + f38593fe-f55f-4fa9-b438-59ab39b03035 + ИД ЕРВУ разлокируемых граждан_unlock + false + false + + + + cssClasses + + + + "width-full" + + + + + + errorTooltipStyle + + + + height + + null + + + +false + + + + label + +"ИД ЕРВУ разлокируемых граждан" + + + + style + + + + height + + "200px" + + + + + + + + + + + + false + + + + SaveValueToVariable + modules.bpmn.script + + true + true + + + variable + +"lock_ids_string" + + + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f a18f6614-fec4-4567-926d-984d38ac4db4 @@ -1590,7 +1853,7 @@ behavior -{"objectId":"8c85fe31-bdb8-495e-8c4c-7addc9d7ba71","packageName":"component.field","className":"TextArea","type":"TS"} +{"objectId":"f38593fe-f55f-4fa9-b438-59ab39b03035","packageName":"component.field","className":"TextArea","type":"TS"} @@ -1614,10 +1877,6 @@ executeSqlButtonService - - ReadOnlySqlButtonServiceImpl - ru.micord.ervu_secret.component.service - jndiName @@ -1632,6 +1891,10 @@ + + ReadOnlySqlButtonServiceImpl + ru.micord.ervu_secret.component.service + @@ -1684,7 +1947,7 @@ ervuIdField - {"objectId":"8c85fe31-bdb8-495e-8c4c-7addc9d7ba71","packageName":"component.field","className":"TextArea","type":"TS"} + {"objectId":"f38593fe-f55f-4fa9-b438-59ab39b03035","packageName":"component.field","className":"TextArea","type":"TS"}