diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr1(m_c).hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr1(m_c).hpl index bb63ea7..27531bc 100644 --- a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr1(m_c).hpl +++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr1(m_c).hpl @@ -128,18 +128,12 @@ WITH ids AS ( SELECT unnest(string_to_array(trim(both '{}' from '${ARR_PR_1}'), ','))::uuid AS recruitment_id -), - r_ids AS (SELECT id as recruit_id, gender, birth_date,target_recruitment_id from public.recruits - where (target_recruitment_id IS NULL OR target_recruitment_id IN (SELECT recruitment_id FROM ids)) - AND current_recruitment_id is null ), last_status as (select recruit_id, - max(rh.date_time) filter (where rh.status in ('1', '12.7', '8.2', '8.3')) max_date_time - from recruits_history rh - join recruits r on r.id = rh.recruit_id - where rh.status in ('1', '12.7', '8.2', '8.3') - and r.current_recruitment_id is null - group by rh.recruit_id), + max(date_time) filter (where status in ('1', '12.7', '8.2', '8.3')) max_date_time + from recruits_history + where status in ('1', '12.7', '8.2', '8.3') + group by recruit_id), notregistered as ( select distinct rh.recruit_id, @@ -151,7 +145,7 @@ notregistered as ( ), vse AS ( SELECT - r.recruit_id AS r_id, + r.id AS r_id, ri.recruit_id AS recruit_id, coalesce (r.target_recruitment_id, rh.target_recruitment_id) AS r_target_recruitment_id, r.gender, @@ -172,12 +166,16 @@ vse AS ( ELSE true END AS hidden, -- когда фолс отсрочка есть, когда тру или нулл - нет ri.info - FROM r_ids r + FROM public.recruits AS r JOIN public.recruits_info AS ri - ON ri.recruit_id = r.recruit_id - JOIN public.recruits_history rh on rh.recruit_id=r.recruit_id - LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.recruit_id - WHERE coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + ON ri.recruit_id = r.id + JOIN public.recruits_history rh on rh.recruit_id=r.id + LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.id + WHERE + r.id in (SELECT recruit_id FROM notregistered) and + rh.id in (SELECT recruit_history_id FROM notregistered) and + coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + AND r.current_recruitment_id is null ), extracted_children AS ( SELECT diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr2(m_c).hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr2(m_c).hpl index b215645..5a66932 100644 --- a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr2(m_c).hpl +++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr2(m_c).hpl @@ -128,18 +128,12 @@ WITH ids AS ( SELECT unnest(string_to_array(trim(both '{}' from '${ARR_PR_2}'), ','))::uuid AS recruitment_id -), - r_ids AS (SELECT id as recruit_id, gender, birth_date,target_recruitment_id from public.recruits - where (target_recruitment_id IS NULL OR target_recruitment_id IN (SELECT recruitment_id FROM ids)) - AND current_recruitment_id is null ), last_status as (select recruit_id, - max(rh.date_time) filter (where rh.status in ('1', '12.7', '8.2', '8.3')) max_date_time - from recruits_history rh - join recruits r on r.id = rh.recruit_id - where rh.status in ('1', '12.7', '8.2', '8.3') - and r.current_recruitment_id is null - group by rh.recruit_id), + max(date_time) filter (where status in ('1', '12.7', '8.2', '8.3')) max_date_time + from recruits_history + where status in ('1', '12.7', '8.2', '8.3') + group by recruit_id), notregistered as ( select distinct rh.recruit_id, @@ -151,7 +145,7 @@ notregistered as ( ), vse AS ( SELECT - r.recruit_id AS r_id, + r.id AS r_id, ri.recruit_id AS recruit_id, coalesce (r.target_recruitment_id, rh.target_recruitment_id) AS r_target_recruitment_id, r.gender, @@ -172,12 +166,16 @@ vse AS ( ELSE true END AS hidden, -- когда фолс отсрочка есть, когда тру или нулл - нет ri.info - FROM r_ids r + FROM public.recruits AS r JOIN public.recruits_info AS ri - ON ri.recruit_id = r.recruit_id - JOIN public.recruits_history rh on rh.recruit_id=r.recruit_id - LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.recruit_id - WHERE coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + ON ri.recruit_id = r.id + JOIN public.recruits_history rh on rh.recruit_id=r.id + LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.id + WHERE + r.id in (SELECT recruit_id FROM notregistered) and + rh.id in (SELECT recruit_history_id FROM notregistered) and + coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + AND r.current_recruitment_id is null ), extracted_children AS ( SELECT diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr3(m_c).hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr3(m_c).hpl index 0d799b0..6cf641c 100644 --- a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr3(m_c).hpl +++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr3(m_c).hpl @@ -128,18 +128,12 @@ WITH ids AS ( SELECT unnest(string_to_array(trim(both '{}' from '${ARR_PR_3}'), ','))::uuid AS recruitment_id -), - r_ids AS (SELECT id as recruit_id, gender, birth_date,target_recruitment_id from public.recruits - where (target_recruitment_id IS NULL OR target_recruitment_id IN (SELECT recruitment_id FROM ids)) - AND current_recruitment_id is null ), last_status as (select recruit_id, - max(rh.date_time) filter (where rh.status in ('1', '12.7', '8.2', '8.3')) max_date_time - from recruits_history rh - join recruits r on r.id = rh.recruit_id - where rh.status in ('1', '12.7', '8.2', '8.3') - and r.current_recruitment_id is null - group by rh.recruit_id), + max(date_time) filter (where status in ('1', '12.7', '8.2', '8.3')) max_date_time + from recruits_history + where status in ('1', '12.7', '8.2', '8.3') + group by recruit_id), notregistered as ( select distinct rh.recruit_id, @@ -151,7 +145,7 @@ notregistered as ( ), vse AS ( SELECT - r.recruit_id AS r_id, + r.id AS r_id, ri.recruit_id AS recruit_id, coalesce (r.target_recruitment_id, rh.target_recruitment_id) AS r_target_recruitment_id, r.gender, @@ -172,12 +166,16 @@ vse AS ( ELSE true END AS hidden, -- когда фолс отсрочка есть, когда тру или нулл - нет ri.info - FROM r_ids r + FROM public.recruits AS r JOIN public.recruits_info AS ri - ON ri.recruit_id = r.recruit_id - JOIN public.recruits_history rh on rh.recruit_id=r.recruit_id - LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.recruit_id - WHERE coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + ON ri.recruit_id = r.id + JOIN public.recruits_history rh on rh.recruit_id=r.id + LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.id + WHERE + r.id in (SELECT recruit_id FROM notregistered) and + rh.id in (SELECT recruit_history_id FROM notregistered) and + coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + AND r.current_recruitment_id is null ), extracted_children AS ( SELECT diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr4(m_c).hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr4(m_c).hpl index 528e65d..208c357 100644 --- a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr4(m_c).hpl +++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr4(m_c).hpl @@ -128,18 +128,12 @@ WITH ids AS ( SELECT unnest(string_to_array(trim(both '{}' from '${ARR_PR_4}'), ','))::uuid AS recruitment_id -), - r_ids AS (SELECT id as recruit_id, gender, birth_date,target_recruitment_id from public.recruits - where (target_recruitment_id IS NULL OR target_recruitment_id IN (SELECT recruitment_id FROM ids)) - AND current_recruitment_id is null ), last_status as (select recruit_id, - max(rh.date_time) filter (where rh.status in ('1', '12.7', '8.2', '8.3')) max_date_time - from recruits_history rh - join recruits r on r.id = rh.recruit_id - where rh.status in ('1', '12.7', '8.2', '8.3') - and r.current_recruitment_id is null - group by rh.recruit_id), + max(date_time) filter (where status in ('1', '12.7', '8.2', '8.3')) max_date_time + from recruits_history + where status in ('1', '12.7', '8.2', '8.3') + group by recruit_id), notregistered as ( select distinct rh.recruit_id, @@ -151,7 +145,7 @@ notregistered as ( ), vse AS ( SELECT - r.recruit_id AS r_id, + r.id AS r_id, ri.recruit_id AS recruit_id, coalesce (r.target_recruitment_id, rh.target_recruitment_id) AS r_target_recruitment_id, r.gender, @@ -172,12 +166,16 @@ vse AS ( ELSE true END AS hidden, -- когда фолс отсрочка есть, когда тру или нулл - нет ri.info - FROM r_ids r + FROM public.recruits AS r JOIN public.recruits_info AS ri - ON ri.recruit_id = r.recruit_id - JOIN public.recruits_history rh on rh.recruit_id=r.recruit_id - LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.recruit_id - WHERE coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + ON ri.recruit_id = r.id + JOIN public.recruits_history rh on rh.recruit_id=r.id + LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.id + WHERE + r.id in (SELECT recruit_id FROM notregistered) and + rh.id in (SELECT recruit_history_id FROM notregistered) and + coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + AND r.current_recruitment_id is null ), extracted_children AS ( SELECT diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr5(m_c).hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr5(m_c).hpl index df3acc6..e37554e 100644 --- a/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr5(m_c).hpl +++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c)/main_dashboard.waiting_registration_pr5(m_c).hpl @@ -128,18 +128,12 @@ WITH ids AS ( SELECT unnest(string_to_array(trim(both '{}' from '${ARR_PR_5}'), ','))::uuid AS recruitment_id -), - r_ids AS (SELECT id as recruit_id, gender, birth_date,target_recruitment_id from public.recruits - where (target_recruitment_id IS NULL OR target_recruitment_id IN (SELECT recruitment_id FROM ids)) - AND current_recruitment_id is null ), last_status as (select recruit_id, - max(rh.date_time) filter (where rh.status in ('1', '12.7', '8.2', '8.3')) max_date_time - from recruits_history rh - join recruits r on r.id = rh.recruit_id - where rh.status in ('1', '12.7', '8.2', '8.3') - and r.current_recruitment_id is null - group by rh.recruit_id), + max(date_time) filter (where status in ('1', '12.7', '8.2', '8.3')) max_date_time + from recruits_history + where status in ('1', '12.7', '8.2', '8.3') + group by recruit_id), notregistered as ( select distinct rh.recruit_id, @@ -151,7 +145,7 @@ notregistered as ( ), vse AS ( SELECT - r.recruit_id AS r_id, + r.id AS r_id, ri.recruit_id AS recruit_id, coalesce (r.target_recruitment_id, rh.target_recruitment_id) AS r_target_recruitment_id, r.gender, @@ -172,12 +166,16 @@ vse AS ( ELSE true END AS hidden, -- когда фолс отсрочка есть, когда тру или нулл - нет ri.info - FROM r_ids r + FROM public.recruits AS r JOIN public.recruits_info AS ri - ON ri.recruit_id = r.recruit_id - JOIN public.recruits_history rh on rh.recruit_id=r.recruit_id - LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.recruit_id - WHERE coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + ON ri.recruit_id = r.id + JOIN public.recruits_history rh on rh.recruit_id=r.id + LEFT JOIN public.decision_deferment_dto ddd ON ddd.recruit_id = r.id + WHERE + r.id in (SELECT recruit_id FROM notregistered) and + rh.id in (SELECT recruit_history_id FROM notregistered) and + coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids) + AND r.current_recruitment_id is null ), extracted_children AS ( SELECT