micord/ervu-secret
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
ilyin 2024-09-27 21:15:01 +03:00
parent fd0ebc7ba5
commit 309850c070
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
config-data-executor/config-examples/block.xml
View file

@ -6,9 +6,9 @@
$$ $$
begin begin
update recruits update recruits
set current_recruitment_id = '812228fe-42d3-4094-9508-2d1ca2739de8' set current_recruitment_id = '04047533-ee2d-4266-b656-e509a547f0e9'
,target_recruitment_id = '812228fe-42d3-4094-9508-2d1ca2739de8' ,target_recruitment_id = '04047533-ee2d-4266-b656-e509a547f0e9'
,department_id_old = '812228fe-42d3-4094-9508-2d1ca2739de8' ,department_id_old = '04047533-ee2d-4266-b656-e509a547f0e9'
,system_pgs_status = '13' ,system_pgs_status = '13'
,extra_info = jsonb_set(coalesce(extra_info,'{}'::jsonb), '{blocked}', ,extra_info = jsonb_set(coalesce(extra_info,'{}'::jsonb), '{blocked}',
('{"cur":'|| coalesce('"'||current_recruitment_id::text||'"','null')|| ('{"cur":'|| coalesce('"'||current_recruitment_id::text||'"','null')||
@ -39,22 +39,22 @@
DO DO
$$ $$
BEGIN BEGIN
DELETE FROM subpoena_history where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}; DELETE FROM subpoena_history where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments});
DELETE FROM subpoena_appearance where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})); DELETE FROM subpoena_appearance where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments});
DELETE FROM subpoena_send_info where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})); DELETE FROM subpoena_send_info where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments});
DELETE FROM notification_item where restriction_document_item_id in ( DELETE FROM notification_item where restriction_document_item_id in (
select id from restriction_document_item where restriction_document_create_id in ( select id from restriction_document_item where restriction_document_create_id in (
select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})))); select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})));
DELETE FROM notification_item where restriction_document_item_id in ( DELETE FROM notification_item where restriction_document_item_id in (
select id from restriction_document_item where restriction_document_cancel_id in ( select id from restriction_document_item where restriction_document_cancel_id in (
select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})))); select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})));
DELETE FROM restriction_document_item where restriction_document_create_id in ( DELETE FROM restriction_document_item where restriction_document_create_id in (
select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}))); select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}));
DELETE FROM restriction_document_item where restriction_document_cancel_id in ( DELETE FROM restriction_document_item where restriction_document_cancel_id in (
select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}))); select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}));
DELETE FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})); DELETE FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments});
DELETE FROM subpoena where recruit_id in ${endpointArguments}; DELETE FROM subpoena where recruit_id in ${endpointArguments};
END END
$$; $$;
@ -80,7 +80,7 @@
BEGIN BEGIN
DELETE DELETE
FROM incident_history FROM incident_history
where incident_id in (select id from incident where recruit_id in ${endpointArguments})); where incident_id in (select id from incident where recruit_id in ${endpointArguments});
DELETE FROM incident where recruit_id in ${endpointArguments}; DELETE FROM incident where recruit_id in ${endpointArguments};
END END
$$; $$;

2
config-data-executor/src/main/java/org/micord/service/RequestService.java
View file

@ -150,7 +150,7 @@ public class RequestService {
private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) { private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
String endpointArguments = ids.stream() String endpointArguments = ids.stream()
.map(String::trim) .map(id -> "'" + id.trim() + "'")
.collect(Collectors.joining(", ")); .collect(Collectors.joining(", "));
String requestURL = request.getRequestURL(); String requestURL = request.getRequestURL();

1
resources/src/main/resources/business-model/main.page
View file

@ -48,6 +48,7 @@
<componentRootId>15508c49-88e3-4143-a398-cbfaedc4a59f</componentRootId> <componentRootId>15508c49-88e3-4143-a398-cbfaedc4a59f</componentRootId>
<name>Tab container</name> <name>Tab container</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="1c20b23e-f269-42ff-aa6f-ec2e7ff152cf"/> <scripts id="1c20b23e-f269-42ff-aa6f-ec2e7ff152cf"/>
<scripts id="aba9b3cf-fe50-4149-84cd-ff7b6ed4e99d"> <scripts id="aba9b3cf-fe50-4149-84cd-ff7b6ed4e99d">