From 5865f89b952fd824724447da8bb3329eed8898b6 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Wed, 12 Feb 2025 15:24:20 +0300 Subject: [PATCH] fix --- .../main_dashboard.recruitment_campaign.hpl | 3 - .../info_recruits/citizen_foreign.hpl | 2 +- .../info_recruits/job_info_recruits.hwf | 424 ++++++++++++------ .../jobs_once_a_day/child_once.hpl | 5 +- .../jobs_once_a_day/citizen_foreign_once.hpl | 78 ++-- .../jobs_once_a_day/citizenship_once.hpl | 41 +- .../jobs_once_a_day/deputy_once.hpl | 10 +- .../jobs_once_a_day/disability_once.hpl | 78 ++-- .../jobs_once_a_day/disease_once.hpl | 41 +- .../jobs_once_a_day/drivers_licence_once.hpl | 78 ++-- .../jobs_once_a_day/info_recruits_once.hpl | 5 +- .../job_info_recruits_once.hwf | 390 +++++++++++----- .../medical_authorities_once.hpl | 78 ++-- .../jobs_once_a_day/opekun_once.hpl | 5 +- .../jobs_once_a_day/passport_once.hpl | 2 +- .../jobs_once_a_day/property_once.hpl | 161 +++---- .../jobs_once_a_day/prosecution_once.hpl | 41 +- .../jobs_once_a_day/punishment_once.hpl | 41 +- .../jobs_once_a_day/spouse_once.hpl | 5 +- .../jobs_once_a_day/subpoena_once.hpl | 5 +- .../temporary_measure_once.hpl | 41 +- .../mil_com/job_recruitments_milcom.hwf | 1 - .../mil_com/parameters/array_recruitments.hpl | 2 +- 23 files changed, 885 insertions(+), 652 deletions(-) diff --git a/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl b/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl index 61dd697..16514c4 100644 --- a/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl +++ b/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl @@ -122,19 +122,16 @@ WHERE recording_date = current_date = spring_autumn spring_autumn - = recruitment_id REG_ID - = schema schema - main_dashboard recruitment_campaign
diff --git a/v1_apache-hop dash mapping/info_recruits/citizen_foreign.hpl b/v1_apache-hop dash mapping/info_recruits/citizen_foreign.hpl index c3a1905..05afeba 100644 --- a/v1_apache-hop dash mapping/info_recruits/citizen_foreign.hpl +++ b/v1_apache-hop dash mapping/info_recruits/citizen_foreign.hpl @@ -146,7 +146,7 @@ 672 - 320 + 304 diff --git a/v1_apache-hop dash mapping/info_recruits/job_info_recruits.hwf b/v1_apache-hop dash mapping/info_recruits/job_info_recruits.hwf index c012513..fc4290e 100644 --- a/v1_apache-hop dash mapping/info_recruits/job_info_recruits.hwf +++ b/v1_apache-hop dash mapping/info_recruits/job_info_recruits.hwf @@ -41,16 +41,6 @@ 1984 - - Success - - SUCCESS - - N - 1424 - 1984 - - info_recruits @@ -835,36 +825,178 @@ 2096 + + Success opekun + + SUCCESS + + N + 1152 + 1600 + + + + Success info_recruits + + SUCCESS + + N + 1152 + 1536 + + + + Success spouse + + SUCCESS + + N + 1152 + 1664 + + + + Success child + + SUCCESS + + N + 1152 + 1728 + + + + Success desease + + SUCCESS + + N + 1152 + 1792 + + + + Success medical_autorities + + SUCCESS + + N + 1184 + 1856 + + + + Success disability + + SUCCESS + + N + 1152 + 1920 + + + + Success driver_license + + SUCCESS + + N + 1152 + 1984 + + + + Success property + + SUCCESS + + N + 1152 + 2048 + + + + Success citizen_foreign + + SUCCESS + + N + 1152 + 2112 + + + + Success citizenship + + SUCCESS + + N + 1152 + 2176 + + + + Success deputy + + SUCCESS + + N + 1152 + 2240 + + + + Success prosecution + + SUCCESS + + N + 1152 + 2304 + + + + Success punishment + + SUCCESS + + N + 1152 + 2368 + + + + Success passport + + SUCCESS + + N + 1152 + 2432 + + + + Success subpoena + + SUCCESS + + N + 1152 + 2496 + + + + Success temporary_measure + + SUCCESS + + N + 1184 + 2560 + + - - info_recruits - Success - Y - N - Y - - - child - Success - Y - N - Y - - - spouse - Success - Y - N - Y - - - opekun - Success - Y - N - Y - Start SQL.child @@ -886,20 +1018,6 @@ Y Y - - disease - Success - Y - N - Y - - - medical_authorities - Success - Y - N - Y - Start SQL.disability @@ -907,13 +1025,6 @@ Y Y - - disability - Success - Y - N - Y - Start SQL.drivers_licence @@ -921,13 +1032,6 @@ Y Y - - drivers_licence - Success - Y - N - Y - Start SQL.property @@ -935,13 +1039,6 @@ Y Y - - property - Success - Y - N - Y - Start SQL.citizen_foreign @@ -949,20 +1046,6 @@ Y Y - - citizen_foreign - Success - Y - N - Y - - - citizenship - Success - Y - N - Y - Start SQL.citizenship @@ -970,13 +1053,6 @@ Y Y - - deputy - Success - Y - N - Y - Start SQL.deputy @@ -991,13 +1067,6 @@ Y Y - - prosecution - Success - Y - N - Y - Start SQL.punishment @@ -1005,13 +1074,6 @@ Y Y - - punishment - Success - Y - N - Y - Start SQL.passport @@ -1019,20 +1081,6 @@ Y Y - - passport - Success - Y - N - Y - - - subpoena - Success - Y - N - Y - Start SQL.subpoena @@ -1047,13 +1095,6 @@ Y Y - - temporary_measure - Success - Y - N - Y - Start select_delta_time.hpl @@ -1253,7 +1294,7 @@ Start select_delta_time_subpoena.hpl - Y + N Y Y @@ -1271,6 +1312,125 @@ Y N + + info_recruits + Success info_recruits + Y + N + Y + + + opekun + Success opekun + Y + N + Y + + + spouse + Success spouse + Y + N + Y + + + child + Success child + Y + N + Y + + + disease + Success desease + Y + N + Y + + + medical_authorities + Success medical_autorities + Y + N + Y + + + disability + Success disability + Y + N + Y + + + drivers_licence + Success driver_license + Y + N + Y + + + property + Success property + Y + N + Y + + + citizen_foreign + Success citizen_foreign + Y + N + Y + + + citizenship + Success citizenship + Y + N + Y + + + deputy + Success deputy + Y + N + Y + + + prosecution + Success prosecution + Y + N + Y + + + punishment + Success punishment + Y + N + Y + + + passport + Success passport + Y + N + Y + + + subpoena + Success subpoena + Y + N + Y + + + temporary_measure + Success temporary_measure + Y + N + Y + @@ -1308,8 +1468,8 @@ Segoe UI 9 26 - 1328 - 2320 + 1712 + 1904 status_change_date добавить колонку в ervu_dashboard.subpoena 367 diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/child_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/child_once.hpl index 4cb4e2c..28a18cd 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/child_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/child_once.hpl @@ -148,7 +148,7 @@ join child on r.id = child.recruit_id none - 1000 + 50000 ervu-dashboard @@ -156,11 +156,14 @@ join child on r.id = child.recruit_id N N N + Y + N ervu_dashboard N citizen_child
+ N Y N diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_foreign_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_foreign_once.hpl index 14b245f..422ea53 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_foreign_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_foreign_once.hpl @@ -1,3 +1,4 @@ + citizen_foreign_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -45,6 +43,8 @@ ervu_person_registry + N + 0 with citizen as (select jsonb_array_elements(ri.info->'svedIGPP'->'svedIG') cit, ri.recruit_id @@ -57,17 +57,11 @@ select to_date(cit->>'dataPriobrIG', 'YYYY-MM-DD') citizenship_date from public.recruits r join citizen on r.id = citizen.recruit_id; - 0 - - N N - N - 208 208 - Y @@ -82,6 +76,8 @@ join citizen on r.id = citizen.recruit_id; ervu_person_registry + N + 0 with citizen as (select jsonb_array_elements(ri.info->'svedIGPP'->'svedPP') cit, ri.recruit_id @@ -94,17 +90,11 @@ select to_date(cit->>'dataPriobrPP', 'YYYY-MM-DD') residense_right_date from public.recruits r join citizen on r.id = citizen.recruit_id; - 0 - - N N - N - 208 304 - Y @@ -118,31 +108,30 @@ join citizen on r.id = citizen.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - citizenship_foreign
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + citizenship_foreign
+ + N + Y + N + Y - 672 208 - Y @@ -156,31 +145,30 @@ join citizen on r.id = citizen.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - citizenship_foreign
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + citizenship_foreign
+ + N + Y + N + Y - 672 304 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/citizenship_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/citizenship_once.hpl index cd03daf..9a6d50f 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/citizenship_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/citizenship_once.hpl @@ -1,3 +1,4 @@ + citizenship_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -40,6 +38,8 @@ ervu_person_registry + N + 0 select r.id recruit_id, ri.info->'svedGrazhdanRF'->'grazhdanRF'->>'osnPriob' acquiring_basis, ri.info->'svedGrazhdanRF'->'grazhdanRF'->>'nomReshPriob' acquiring_number, @@ -53,17 +53,11 @@ from public.recruits_info ri join public.recruits r ON ri.recruit_id = r.id where ri.info->'svedGrazhdanRF'->>'prOtsGrazhdanRF' is null and (ri.info->'svedGrazhdanRF'->'grazhdanRF'->>'nomReshPriob' is not null or ri.info->'svedGrazhdanRF'->'grazhdanRF'->>'osnVyh' is not null) - 0 - - N N - N - 432 224 - Y @@ -77,31 +71,30 @@ where ri.info->'svedGrazhdanRF'->>'prOtsGrazhdanRF' is null and none + 50000 ervu-dashboard - ervu_dashboard - citizenship
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + citizenship
+ + N + Y + N + Y - 672 224 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/deputy_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/deputy_once.hpl index a937c11..0df54a5 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/deputy_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/deputy_once.hpl @@ -152,7 +152,7 @@ where ri.info->'svedKandidat'->'kandidat'->>'svedRegKandidata' is not null;none - 1000 + 50000 ervu-dashboard @@ -160,11 +160,14 @@ where ri.info->'svedKandidat'->'kandidat'->>'svedRegKandidata' is not null;N N N + Y + N ervu_dashboard N deputy
+ N Y N @@ -186,7 +189,7 @@ where ri.info->'svedKandidat'->'kandidat'->>'svedRegKandidata' is not null;none - 1000 + 50000 ervu-dashboard @@ -194,11 +197,14 @@ where ri.info->'svedKandidat'->'kandidat'->>'svedRegKandidata' is not null;N N N + Y + N ervu_dashboard N deputy
+ N Y N diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/disability_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/disability_once.hpl index 4e65e8e..4235c99 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/disability_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/disability_once.hpl @@ -1,3 +1,4 @@ + disability_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -45,6 +43,8 @@ ervu_person_registry + N + 0 select r.id recruit_id, case when ri.info->'svedInvalid'->'invalid'->>'gruppa'='1' then 'I группа' @@ -60,17 +60,11 @@ from public.recruits r join public.recruits_info ri on r.id = ri.recruit_id where ri.info->'svedInvalid'->'invalid'->>'gruppa' is not null; - 0 - - N N - N - 208 208 - Y @@ -85,6 +79,8 @@ where ri.info->'svedInvalid'->'invalid'->>'gruppa' is not null; ervu_person_registry + N + 0 select r.id recruit_id, ri.info->'svedNedeesp'->'nedeesposob'->>'naimSud' organization_name, @@ -93,17 +89,11 @@ where ri.info->'svedInvalid'->'invalid'->>'gruppa' is not null; from public.recruits r join public.recruits_info ri on r.id = ri.recruit_id where ri.info->'svedNedeesp'->'nedeesposob'->>'naimSud' is not null; - 0 - - N N - N - 208 304 - Y @@ -117,31 +107,30 @@ where ri.info->'svedNedeesp'->'nedeesposob'->>'naimSud' is not null; none + 50000 ervu-dashboard - ervu_dashboard - disability
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + disability
+ + N + Y + N + Y - 416 208 - Y @@ -155,31 +144,30 @@ where ri.info->'svedNedeesp'->'nedeesposob'->>'naimSud' is not null; none + 50000 ervu-dashboard - ervu_dashboard - disability
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + disability
+ + N + Y + N + Y - 416 304 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/disease_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/disease_once.hpl index 9a07e89..d8b53d8 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/disease_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/disease_once.hpl @@ -1,3 +1,4 @@ + disease_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -40,6 +38,8 @@ ervu_person_registry + N + 0 with zdorov as (select jsonb_array_elements(ri.info->'svedSostZdorov'->'svedZdorov'->'sostZdorov') z, ri.recruit_id @@ -52,17 +52,11 @@ select to_date(z->>'dataDiagn', 'YYYY-MM-DD') reg_date from public.recruits r join zdorov on r.id = zdorov.recruit_id; - 0 - - N N - N - 208 208 - Y @@ -76,31 +70,30 @@ join zdorov on r.id = zdorov.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - disease
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + disease
+ + N + Y + N + Y - 416 208 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/drivers_licence_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/drivers_licence_once.hpl index 9eccf40..d4bedf0 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/drivers_licence_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/drivers_licence_once.hpl @@ -1,3 +1,4 @@ + drivers_licence_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -45,6 +43,8 @@ ervu_person_registry + N + 0 select r.id recruit_id, ri.info->'svedVoditUdost'->'voditUdost'->>'serVodUd' licence_series, @@ -58,17 +58,11 @@ from public.recruits r join public.recruits_info ri on r.id = ri.recruit_id where ri.info->'svedVoditUdost'->'voditUdost'->>'serVodUd' is not null; - 0 - - N N - N - 208 208 - Y @@ -83,6 +77,8 @@ where ri.info->'svedVoditUdost'->'voditUdost'->>'serVodUd' is not null; ervu_person_registry + N + 0 select r.id recruit_id, ri.info->'svedUdostrTraktMash'->'udostrTraktMash'->>'serUTM' licence_series, @@ -101,17 +97,11 @@ from public.recruits r join public.recruits_info ri on r.id = ri.recruit_id where ri.info->'svedUdostrTraktMash'->'udostrTraktMash'->>'serUTM' is not null; - 0 - - N N - N - 208 304 - Y @@ -125,31 +115,30 @@ where ri.info->'svedUdostrTraktMash'->'udostrTraktMash'->>'serUTM' is not null; none + 50000 ervu-dashboard - ervu_dashboard - drivers_licence
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + drivers_licence
+ + N + Y + N + Y - 416 208 - Y @@ -163,31 +152,30 @@ where ri.info->'svedUdostrTraktMash'->'udostrTraktMash'->>'serUTM' is not null; none + 50000 ervu-dashboard - ervu_dashboard - drivers_licence
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + drivers_licence
+ + N + Y + N + Y - 416 304 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/info_recruits_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/info_recruits_once.hpl index 21b26f0..ba1d486 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/info_recruits_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/info_recruits_once.hpl @@ -730,7 +730,7 @@ WHERE none - 1000 + 50000 ervu-dashboard @@ -738,11 +738,14 @@ WHERE N N N + Y + N ervu_dashboard N citizen
+ N Y N diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf b/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf index db128b0..e4de475 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf +++ b/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf @@ -74,13 +74,13 @@ - Success + Success opekun_once SUCCESS N - 1232 - 624 + 1008 + 96 @@ -739,6 +739,166 @@ 96 + + Success info_recruits_once + + SUCCESS + + N + 1008 + 192 + + + + Success spouse_once + + SUCCESS + + N + 1008 + 272 + + + + Success child_once + + SUCCESS + + N + 1008 + 352 + + + + Success desease_once + + SUCCESS + + N + 1008 + 432 + + + + Success medical_autorities_once + + SUCCESS + + N + 1040 + 496 + + + + Success disability_once + + SUCCESS + + N + 1008 + 560 + + + + Success driver_license_once + + SUCCESS + + N + 1008 + 624 + + + + Success property_once + + SUCCESS + + N + 1008 + 688 + + + + Success citizen_foreign_once + + SUCCESS + + N + 1008 + 752 + + + + Success citizenship_once + + SUCCESS + + N + 1008 + 816 + + + + Success deputy_once + + SUCCESS + + N + 1008 + 880 + + + + Success prosecution_once + + SUCCESS + + N + 1008 + 944 + + + + Success punishment_once + + SUCCESS + + N + 1008 + 1008 + + + + Success passport_once + + SUCCESS + + N + 1008 + 1072 + + + + Success subpoena_once + + SUCCESS + + N + 1008 + 1136 + + + + Success temporary_measure_once + + SUCCESS + + N + 1040 + 1200 + + @@ -755,13 +915,6 @@ Y N - - info_recruits_once.hpl - Success - Y - Y - N - SQL.spouse spouse_once.hpl @@ -883,10 +1036,10 @@ opekun_once.hpl - Success + Success opekun_once Y - Y - N + N + Y Start @@ -902,20 +1055,6 @@ Y Y - - child_once.hpl - Success - Y - Y - N - - - spouse_once.hpl - Success - Y - Y - N - Start SQL.disease @@ -923,13 +1062,6 @@ Y Y - - disease_once.hpl - Success - Y - Y - N - Start SQL.medical_authorities @@ -937,13 +1069,6 @@ Y Y - - medical_authorities_once.hpl - Success - Y - Y - N - Start SQL.property @@ -951,13 +1076,6 @@ Y Y - - property_once.hpl - Success - Y - Y - N - Start SQL.disability @@ -965,13 +1083,6 @@ Y Y - - disability_once.hpl - Success - Y - Y - N - Start SQL.drivers_licence @@ -979,13 +1090,6 @@ Y Y - - drivers_licence_once.hpl - Success - Y - Y - N - Start SQL.citizen_foreign @@ -993,13 +1097,6 @@ Y Y - - citizen_foreign_once.hpl - Success - Y - Y - N - Start SQL.citizenship @@ -1007,13 +1104,6 @@ Y Y - - citizenship_once.hpl - Success - Y - Y - N - Start SQL.deputy @@ -1021,13 +1111,6 @@ Y Y - - deputy_once.hpl - Success - Y - Y - N - Start SQL.prosecution @@ -1035,13 +1118,6 @@ Y Y - - prosecution_once.hpl - Success - Y - Y - N - Start SQL.punishment @@ -1049,13 +1125,6 @@ Y Y - - punishment_once.hpl - Success - Y - Y - N - Start SQL.passport @@ -1063,13 +1132,6 @@ Y Y - - passport_once.hpl - Success - Y - Y - N - Start SQL.subpoena @@ -1077,13 +1139,6 @@ Y Y - - subpoena_once.hpl - Success - Y - Y - N - Start SQL.tempmeas @@ -1092,11 +1147,116 @@ Y - temporary_measure_once.hpl - Success + info_recruits_once.hpl + Success info_recruits_once Y - Y - N + N + Y + + + spouse_once.hpl + Success spouse_once + Y + N + Y + + + child_once.hpl + Success child_once + Y + N + Y + + + disease_once.hpl + Success desease_once + Y + N + Y + + + medical_authorities_once.hpl + Success medical_autorities_once + Y + N + Y + + + disability_once.hpl + Success disability_once + Y + N + Y + + + drivers_licence_once.hpl + Success driver_license_once + Y + N + Y + + + property_once.hpl + Success property_once + Y + N + Y + + + citizen_foreign_once.hpl + Success citizen_foreign_once + Y + N + Y + + + citizenship_once.hpl + Success citizenship_once + Y + N + Y + + + deputy_once.hpl + Success deputy_once + Y + N + Y + + + prosecution_once.hpl + Success prosecution_once + Y + N + Y + + + punishment_once.hpl + Success punishment_once + Y + N + Y + + + passport_once.hpl + Success passport_once + Y + N + Y + + + subpoena_once.hpl + Success subpoena_once + Y + N + Y + + + temporary_measure_once.hpl + Success temporary_measure_once + Y + N + Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/medical_authorities_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/medical_authorities_once.hpl index f657e43..62c0638 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/medical_authorities_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/medical_authorities_once.hpl @@ -1,3 +1,4 @@ + medical_authorities_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -45,6 +43,8 @@ ervu_person_registry + N + 0 with uchet as (select jsonb_array_elements(ri.info->'svedPND'->'svedUchetDisp'->'svedUchet') u, ri.recruit_id @@ -57,17 +57,11 @@ select u->>'dataPlan' change_date from public.recruits r join uchet on r.id = uchet.recruit_id; - 0 - - N N - N - 208 352 - Y @@ -82,6 +76,8 @@ join uchet on r.id = uchet.recruit_id; ervu_person_registry + N + 0 with uchet as (select jsonb_array_elements(ri.info->'svedUchetVICH'->'uchetVICH') u, ri.recruit_id @@ -94,17 +90,11 @@ select true HIV from public.recruits r join uchet on r.id = uchet.recruit_id; - 0 - - N N - N - 208 208 - Y @@ -118,31 +108,30 @@ join uchet on r.id = uchet.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - medical_authorities
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + medical_authorities
+ + N + Y + N + Y - 416 208 - Y @@ -156,31 +145,30 @@ join uchet on r.id = uchet.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - medical_authorities
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + medical_authorities
+ + N + Y + N + Y - 416 352 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/opekun_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/opekun_once.hpl index 02512a2..4dc1215 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/opekun_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/opekun_once.hpl @@ -128,7 +128,7 @@ join person on r.id = person.recruit_id none - 1000 + 50000 ervu-dashboard @@ -136,11 +136,14 @@ join person on r.id = person.recruit_id N N N + Y + N ervu_dashboard N citizen_guardianship
+ N Y N diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/passport_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/passport_once.hpl index 1abacc4..8d47eca 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/passport_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/passport_once.hpl @@ -108,7 +108,7 @@ where ri.info->'pasportRF'->'predPasportRF'->>'nomDok' is not null; none - 1000 + 50000 ervu-dashboard diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/property_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/property_once.hpl index 0cd3ab0..5ed282e 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/property_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/property_once.hpl @@ -1,3 +1,4 @@ + property_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -55,6 +53,8 @@ ervu_person_registry + N + 0 with prop as (select jsonb_array_elements(ri.info->'svedON'->'on') u, ri.recruit_id @@ -69,17 +69,11 @@ select 'realty' type_property from public.recruits r join prop on r.id = prop.recruit_id; - 0 - - N N - N - 480 208 - Y @@ -94,6 +88,8 @@ join prop on r.id = prop.recruit_id; ervu_person_registry + N + 0 with prop as (select jsonb_array_elements(ri.info->'svedNazTS'->'nazTS') u, ri.recruit_id @@ -111,17 +107,11 @@ select 'ground_transportation' type_property from public.recruits r join prop on r.id = prop.recruit_id; - 0 - - N N - N - 480 304 - Y @@ -136,6 +126,8 @@ join prop on r.id = prop.recruit_id; ervu_person_registry + N + 0 with prop as (select jsonb_array_elements(ri.info->'svedVozTS'->'vozTS') u, ri.recruit_id @@ -150,17 +142,11 @@ select 'air_vehicles' type_property from public.recruits r join prop on r.id = prop.recruit_id; - 0 - - N N - N - 480 384 - Y @@ -175,31 +161,28 @@ join prop on r.id = prop.recruit_id; ervu_person_registry + N + 0 with prop as -(select jsonb_array_elements(ri.info->'svedVozTS'->'vozTS') u, +(select jsonb_array_elements(ri.info->'svedVodTS'->'vodTS') u, ri.recruit_id from public.recruits_info ri -where jsonb_typeof(ri.info->'svedVozTS'->'vozTS') = 'array') +where jsonb_typeof(ri.info->'svedVodTS'->'vodTS') = 'array') select r.id recruit_id, u->>'naimVid' vehicle_type, u->>'naznKat' vehicle_category, to_date(u->>'dataRegPrav', 'YYYY-MM-DD') start_date, to_date(u->>'dataPrekPrav', 'YYYY-MM-DD') close_date, - 'air_vehicles' type_property + 'water_vehicles' type_property from public.recruits r -join prop on r.id = prop.recruit_id; - 0 - - N +join prop on r.id = prop.recruit_id + N - N - 480 464 - Y @@ -213,31 +196,30 @@ join prop on r.id = prop.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - property
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + property
+ + N + Y + N + Y - 688 208 - Y @@ -251,31 +233,30 @@ join prop on r.id = prop.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - property
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + property
+ + N + Y + N + Y - 688 304 - Y @@ -289,31 +270,30 @@ join prop on r.id = prop.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - property
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + property
+ + N + Y + N + Y - 688 384 - Y @@ -327,31 +307,30 @@ join prop on r.id = prop.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - property
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + property
+ + N + Y + N + Y - 688 464 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/prosecution_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/prosecution_once.hpl index 68b0b89..d61fb32 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/prosecution_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/prosecution_once.hpl @@ -1,3 +1,4 @@ + prosecution_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -40,6 +38,8 @@ ervu_person_registry + N + 0 with ugol as (select jsonb_array_elements(ri.info->'svedUgolovPresl'->'faktyUgolovPresl') u, ri.recruit_id @@ -55,17 +55,11 @@ select u->>'osnovPrekrashh' termination_basis from public.recruits r join ugol on r.id = ugol.recruit_id; - 0 - - N N - N - 528 304 - Y @@ -79,31 +73,30 @@ join ugol on r.id = ugol.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - prosecution
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + prosecution
+ + N + Y + N + Y - 736 304 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/punishment_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/punishment_once.hpl index 9e7f9ca..8367bfa 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/punishment_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/punishment_once.hpl @@ -1,3 +1,4 @@ + punishment_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -40,6 +38,8 @@ ervu_person_registry + N + 0 with ugol as (select jsonb_array_elements(ri.info->'svedSudim'->'sudim'->'osuzhdenie') u, ri.recruit_id @@ -60,17 +60,11 @@ select u->>'osnovOsvobozhd' release_reason from public.recruits r join ugol on r.id = ugol.recruit_id; - 0 - - N N - N - 528 304 - Y @@ -84,31 +78,30 @@ join ugol on r.id = ugol.recruit_id; none + 50000 ervu-dashboard - ervu_dashboard - punishment
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + punishment
+ + N + Y + N + Y - 736 304 - Y diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/spouse_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/spouse_once.hpl index c36a99a..28f7798 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/spouse_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/spouse_once.hpl @@ -255,7 +255,7 @@ JOIN suprug ON r.id = suprug.recruit_id; none - 1000 + 50000 ervu-dashboard @@ -263,11 +263,14 @@ JOIN suprug ON r.id = suprug.recruit_id; N N N + Y + N ervu_dashboard N citizen_spouse
+ N Y N diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/subpoena_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/subpoena_once.hpl index c19a42e..f491e40 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/subpoena_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/subpoena_once.hpl @@ -118,7 +118,7 @@ LEFT JOIN public.subpoena_appearance AS sa none - 1000 + 50000 ervu-dashboard @@ -126,11 +126,14 @@ LEFT JOIN public.subpoena_appearance AS sa N N N + Y + N ervu_dashboard N subpoena
+ N Y N diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/temporary_measure_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/temporary_measure_once.hpl index 5ed6028..d64eb89 100644 --- a/v1_apache-hop dash mapping/jobs_once_a_day/temporary_measure_once.hpl +++ b/v1_apache-hop dash mapping/jobs_once_a_day/temporary_measure_once.hpl @@ -1,3 +1,4 @@ + temporary_measure_once @@ -6,7 +7,6 @@ Normal - / N @@ -16,8 +16,6 @@ 2024/08/15 14:02:51.713 - 2024/08/15 14:02:51.713 - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - N @@ -40,6 +38,8 @@ postgres.subpoena + N + 0 SELECT rd.subpoena_id, rd.vk_id AS recruitment_id, @@ -82,17 +82,11 @@ LEFT JOIN public.restriction_document_status AS rds ON rds.code = rd.status LEFT JOIN public.subpoena AS s ON s.id = rd.subpoena_id - 0 - - N N - N - 208 208 - Y @@ -106,31 +100,30 @@ LEFT JOIN public.subpoena AS s none + 50000 ervu-dashboard - ervu_dashboard - temporary_measures
- 1000 - N + + N - Y - N + N + N N - N Y - N - - Y - N - - + N + ervu_dashboard + N + temporary_measures
+ + N + Y + N + Y - 416 208 - Y diff --git a/v1_apache-hop dash mapping/mil_com/job_recruitments_milcom.hwf b/v1_apache-hop dash mapping/mil_com/job_recruitments_milcom.hwf index 89aee4e..1ecf2eb 100644 --- a/v1_apache-hop dash mapping/mil_com/job_recruitments_milcom.hwf +++ b/v1_apache-hop dash mapping/mil_com/job_recruitments_milcom.hwf @@ -744,7 +744,6 @@ WHERE recording_date = current_date DELETE FROM main_dashboard.recruitment_campaign WHERE recording_date = current_date AND schema IN ('Department', 'MD_LVL', 'REG_LVL', 'empty', 'Organization', 'Region') - N N N diff --git a/v1_apache-hop dash mapping/mil_com/parameters/array_recruitments.hpl b/v1_apache-hop dash mapping/mil_com/parameters/array_recruitments.hpl index b7b79fa..643e468 100644 --- a/v1_apache-hop dash mapping/mil_com/parameters/array_recruitments.hpl +++ b/v1_apache-hop dash mapping/mil_com/parameters/array_recruitments.hpl @@ -85,7 +85,7 @@ ARR_MC - параметр WHERE schema IN ('Department', 'Organization', 'Region') --LIMIT 200 ) -SELECT array_agg(idm_id) AS array_mil_com +SELECT array_agg(idm_id) AS ARRAY_MIL_COM FROM ids GROUP BY rn / 30; N