diff --git a/mappings/info_recruits/checkpoints/check_status_parallel_recruits_info_citizen.hpl b/mappings/info_recruits/checkpoints/check_status_parallel_recruits_info_citizen.hpl
index d260c0a..8a6c549 100644
--- a/mappings/info_recruits/checkpoints/check_status_parallel_recruits_info_citizen.hpl
+++ b/mappings/info_recruits/checkpoints/check_status_parallel_recruits_info_citizen.hpl
@@ -20,11 +20,6 @@
-
- Table input
- Insert / update
- Y
-
Set variables
Write to log
@@ -36,50 +31,6 @@
Y
-
- Insert / update
- InsertUpdate
-
- Y
-
- 1
-
- none
-
-
- 100
- ervu-dashboard
-
-
- =
- job_name
- job_name
-
- public
-
-
- job_name
- job_name
- N
-
-
- record_created
- record_created
- Y
-
-
- status
- status
- Y
-
-
- N
-
-
- 1088
- 288
-
-
Set variables
SetVariable
@@ -93,13 +44,9 @@
- job_name
- PIPE
- PARENT_WORKFLOW
-
-
- status
- STATUS
+
+ exists
+ JOB_PARALLEL_ERROR_EXITS
PARENT_WORKFLOW
@@ -107,7 +54,7 @@
1088
- 176
+ 288
@@ -124,18 +71,10 @@
ervu-dashboard
N
0
- SELECT
- 'job_parallel_recruits_info_citizen' AS job_name,
- CASE
- WHEN COUNT(CASE
- WHEN (job_name = 'citizen_job' AND status IN ('ERROR', 'PROCESSING'))
- OR (job_name = 'recruits_info_job' AND status IN ('ERROR', 'PROCESSING'))
- THEN 1
- END) > 0 THEN 'ERROR'
- ELSE 'SUCCESS'
- END AS status,
- current_timestamp AS record_created
-FROM etl.job_execution;
+ SELECT exists(select 1
+ FROM etl.job_execution
+ where job_name in ('citizen_job', 'recruits_info_job')
+ and status in ('ERROR', 'PROCESSING'));
N
@@ -154,17 +93,17 @@ FROM etl.job_execution;
none
+ Basic
Y
-
-
N
0
- Basic
${STATUS}
+
+
- 1584
- 160
+ 1264
+ 128
diff --git a/mappings/info_recruits/job_general_info_recruits.hwf b/mappings/info_recruits/job_general_info_recruits.hwf
index f4aa7ff..8078d65 100644
--- a/mappings/info_recruits/job_general_info_recruits.hwf
+++ b/mappings/info_recruits/job_general_info_recruits.hwf
@@ -41,172 +41,6 @@
672
-
- job_recruitment.hwf
-
- WORKFLOW
-
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/recruitment/job_recruitment.hwf
- Nothing
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 1552
- 672
-
-
-
- job_recruits_info.hwf
-
- WORKFLOW
-
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/raw_data/info_recruits/job_recruits_info.hwf
- Nothing
-
-
- M_R_CR_DATE
- ${M_R_CR_DATE}
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 2112
- 352
-
-
-
- job_citizen.hwf
-
- WORKFLOW
-
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/citizen_tables/citizen/job_citizen.hwf
- Nothing
-
-
- M_R_CR_DATE
- ${M_R_CR_DATE}
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 2080
- 464
-
-
-
- job_recruit_create_date.hwf
-
- WORKFLOW
-
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/supportive_jobs/job_recruit_create_date.hwf
- Nothing
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 1792
- 672
-
-
-
- branching_job_general_info_recruits.hpl
-
- PIPELINE
-
- N
- N
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/branching_job_general_info_recruits.hpl
- Basic
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 896
- 1056
-
-
-
- IF job_general_info_recruits SUCCESS
-
- SIMPLE_EVAL
-
- SUCCESS
- string
- true
- equal
- equal
- N
- variable
- STATUS
- N
- 1264
- 848
-
-
-
- IF job_general_info_recruits if different SUCCESS
-
- SIMPLE_EVAL
-
- SUCCESS
- string
- true
- different
- equal
- N
- variable
- STATUS
- N
- 1232
- 1056
-
-
job_recruitment.hwf 2
@@ -227,34 +61,8 @@
N
Y
N
- 1488
- 1056
-
-
-
- row_last_recruit_create_date.hpl
-
- PIPELINE
-
- N
- N
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/supportive_jobs/row_last_recruit_create_date.hpl
- Basic
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 1728
- 1056
+ 976
+ 672
@@ -281,7 +89,7 @@
N
Y
N
- 2048
+ 1328
672
@@ -313,34 +121,8 @@
N
Y
N
- 2992
- 672
-
-
-
- change_status_job_general_info_recruits_success.hpl
-
- PIPELINE
-
- N
- N
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/checkpoints/change_status_job_general_info_recruits_success.hpl
- Basic
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 4000
- 672
+ 2400
+ 768
@@ -365,7 +147,7 @@
N
Y
N
- 2368
+ 1664
672
@@ -375,15 +157,15 @@
SIMPLE_EVAL
ERROR
- string
+ boolean
true
equal
equal
N
variable
- STATUS
+ JOB_PARALLEL_ERROR_EXITS
N
- 2704
+ 2048
528
@@ -393,16 +175,16 @@
SIMPLE_EVAL
SUCCESS
- string
- true
+ boolean
+ false
equal
equal
N
variable
- STATUS
+ JOB_PARALLEL_ERROR_EXITS
Y
- 2704
- 672
+ 2048
+ 768
@@ -412,155 +194,10 @@
N
N
- 3360
+ 2400
528
-
- check_status_job_info_recruits_from_json.hpl
-
- PIPELINE
-
- N
- N
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/checkpoints/check_status_job_info_recruits_from_json.hpl
- Basic
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 3296
- 672
-
-
-
- IF job_info_recruits_from_json ERROR
-
- SIMPLE_EVAL
-
- ERROR
- string
- true
- equal
- equal
- N
- variable
- STATUS
- N
- 3632
- 528
-
-
-
- IF job_info_recruits_from_json SUCCESS
-
- SIMPLE_EVAL
-
- SUCCESS
- string
- true
- equal
- equal
- N
- variable
- STATUS
- N
- 3632
- 672
-
-
-
- Abort job_info_recruits_from_json
-
- ABORT
-
- N
- N
- 4304
- 528
-
-
-
- Success job_general_info_recruits
-
- SUCCESS
-
- N
- 4320
- 672
-
-
-
- change_status_job_general_info_recruits_error.hpl
-
- PIPELINE
-
- N
- N
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/checkpoints/change_status_job_general_info_recruits_error.hpl
- Basic
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 3984
- 528
-
-
-
- change_status_job_general_info_recruits_error.hpl 2
-
- PIPELINE
-
- N
- N
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/checkpoints/change_status_job_general_info_recruits_error.hpl
- Basic
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 3040
- 528
-
-
-
- Success
-
- SUCCESS
-
- N
- 2224
- 560
-
-
job_parallel_subpoena_decision_archive_person.hwf
@@ -585,8 +222,8 @@
N
Y
N
- 2992
- 784
+ 2480
+ 1120
@@ -611,8 +248,8 @@
N
Y
N
- 3408
- 784
+ 3056
+ 1120
@@ -629,8 +266,8 @@
variable
STATUS
N
- 3856
- 896
+ 3520
+ 1248
@@ -647,18 +284,8 @@
variable
STATUS
N
- 3856
- 784
-
-
-
- error job_general_info_recruits
-
- SUCCESS
-
- N
- 4192
- 432
+ 3520
+ 1040
@@ -683,8 +310,8 @@
N
Y
N
- 4320
- 784
+ 4016
+ 1040
@@ -709,8 +336,8 @@
N
Y
N
- 4320
- 896
+ 4016
+ 1248
@@ -719,8 +346,8 @@
SUCCESS
N
- 4816
- 784
+ 4496
+ 1040
@@ -729,82 +356,12 @@
SUCCESS
N
- 4816
- 896
+ 4496
+ 1248
-
- job_recruitment.hwf
- job_recruit_create_date.hwf
- Y
- Y
- N
-
-
- job_recruit_create_date.hwf
- job_recruits_info.hwf
- N
- Y
- Y
-
-
- Start
- branching_job_general_info_recruits.hpl
- Y
- Y
- Y
-
-
- branching_job_general_info_recruits.hpl
- IF job_general_info_recruits SUCCESS
- Y
- N
- Y
-
-
- IF job_general_info_recruits SUCCESS
- job_recruitment.hwf
- Y
- Y
- N
-
-
- branching_job_general_info_recruits.hpl
- IF job_general_info_recruits if different SUCCESS
- Y
- N
- Y
-
-
- IF job_general_info_recruits if different SUCCESS
- job_recruitment.hwf 2
- Y
- Y
- N
-
-
- job_recruitment.hwf 2
- row_last_recruit_create_date.hpl
- Y
- Y
- N
-
-
- job_recruit_create_date.hwf
- job_citizen.hwf
- N
- N
- Y
-
-
- job_recruit_create_date.hwf
- job_parallel_recruits_info_citizen.hwf
- Y
- Y
- N
-
job_parallel_recruits_info_citizen.hwf
check_status_parallel_recruits_info_citizen.hpl
@@ -833,83 +390,6 @@
N
Y
-
- job_info_recruits_from_json.hwf
- check_status_job_info_recruits_from_json.hpl
- Y
- Y
- N
-
-
- check_status_job_info_recruits_from_json.hpl
- IF job_info_recruits_from_json SUCCESS
- Y
- N
- Y
-
-
- check_status_job_info_recruits_from_json.hpl
- IF job_info_recruits_from_json ERROR
- Y
- N
- Y
-
-
- IF job_info_recruits_from_json SUCCESS
- change_status_job_general_info_recruits_success.hpl
- Y
- Y
- N
-
-
- change_status_job_general_info_recruits_success.hpl
- Success job_general_info_recruits
- Y
- Y
- N
-
-
- IF job_info_recruits_from_json ERROR
- change_status_job_general_info_recruits_error.hpl
- Y
- Y
- N
-
-
- change_status_job_general_info_recruits_error.hpl
- Abort job_info_recruits_from_json
- N
- Y
- Y
-
-
- IF job_parallel_recruits_info_citizen ERROR
- change_status_job_general_info_recruits_error.hpl 2
- Y
- Y
- N
-
-
- change_status_job_general_info_recruits_error.hpl 2
- Abort parallel_recruits_info_citizen
- Y
- Y
- Y
-
-
- Start
- job_recruitment.hwf
- N
- Y
- Y
-
-
- job_parallel_recruits_info_citizen.hwf
- Success
- N
- Y
- N
-
job_parallel_subpoena_decision_archive_person.hwf
check_status_parallel_subpoena_decision_archive_person.hpl
@@ -934,14 +414,7 @@
IF job_parallel_recruits_info_citizen SUCCESS
job_parallel_subpoena_decision_archive_person.hwf
- Y
- Y
- N
-
-
- change_status_job_general_info_recruits_error.hpl
- error job_general_info_recruits
- Y
+ N
Y
N
@@ -959,13 +432,6 @@
Y
N
-
- row_last_recruit_create_date.hpl
- job_parallel_recruits_info_citizen.hwf
- Y
- Y
- N
-
change_status_job_parallel_subpoena_decision_archive_person_success.hpl
Success job_parallel_subpoena_decision_archive_person
@@ -980,72 +446,29 @@
Y
N
+
+ Start
+ job_recruitment.hwf 2
+ Y
+ Y
+ Y
+
+
+ job_recruitment.hwf 2
+ job_parallel_recruits_info_citizen.hwf
+ Y
+ Y
+ N
+
+
+ IF job_parallel_recruits_info_citizen ERROR
+ Abort parallel_recruits_info_citizen
+ Y
+ Y
+ N
+
-
- 251
- 232
- 201
- 90
- 58
- 14
- N
- 90
- 58
- 14
- N
- Segoe UI
- 9
- 42
- 1584
- 608
- зачистка таблицы военкоматов
-и загрузка ervu_dashboard.recruitment
- 219
-
-
- 251
- 232
- 201
- 90
- 58
- 14
- N
- 90
- 58
- 14
- N
- Segoe UI
- 9
- 74
- 1280
- 432
- ОБЯЗАТЕЛЬНО ЗАФИКСИРОВАТЬ ПОСЛЕДНИЮЮ ДАТУ СОЗДАНИЯ РЕКРУТА(из бд ervu_person_registry) В БД ervu_dashboard,
-ЗАТЕМ ИДТИ ЗА ЭТОЙ ДАТОЙ ПЕРЕД СЕЛЕКТОМ.
-СЕЛЕКТЫ РЕКРУТОВ ПРОИЗВОДИТЬ НЕ БОЛЬШЕ ЭТОЙ ДАТЫ.
-Для чего? - чтобы не терять рекрутов.
- 714
-
-
- 251
- 232
- 201
- 90
- 58
- 14
- N
- 90
- 58
- 14
- N
- Segoe UI
- 9
- 26
- 2880
- 624
- тут все джожбы которые парсят json
- 212
-
diff --git a/mappings/info_recruits/job_parallel_recruits_info_citizen.hwf b/mappings/info_recruits/job_parallel_recruits_info_citizen.hwf
index 9efc81a..fd6cf73 100644
--- a/mappings/info_recruits/job_parallel_recruits_info_citizen.hwf
+++ b/mappings/info_recruits/job_parallel_recruits_info_citizen.hwf
@@ -25,7 +25,7 @@
N
0
1
- N
+ Y
208
384
@@ -59,7 +59,7 @@
Y
N
688
- 480
+ 464
@@ -69,7 +69,7 @@
N
944
- 304
+ 288
@@ -79,7 +79,7 @@
N
944
- 480
+ 464
@@ -102,7 +102,7 @@
N
Y
Y
- 384
+ 400
384
@@ -135,7 +135,7 @@
Y
N
688
- 304
+ 288
@@ -177,6 +177,27 @@
+
+ 251
+ 232
+ 201
+ 90
+ 58
+ 14
+ N
+ 90
+ 58
+ 14
+ N
+ Segoe UI
+ 9
+ 41
+ 384
+ 336
+ не нужна?
+
+ 67
+