fix citizen spouse

This commit is contained in:
r.gaztdinov 2025-06-19 16:19:02 +03:00
parent 092dac5c9a
commit e4c0569017
28 changed files with 865 additions and 504 deletions

View file

@ -129,15 +129,17 @@
bool_or(status = 'ERROR' AND job_name IN (
'job_child',
'job_citizen_guardianship',
'job_passport'
'job_passport',
'job_citizen_spouse'
)) AS has_error,
count(*) FILTER (
WHERE status = 'SUCCESS' AND job_name IN (
'job_child',
'job_citizen_guardianship',
'job_passport'
'job_passport',
'job_citizen_spouse'
)
) = 3 AS all_success
) = 4 AS all_success
FROM public.etl_checkpoints
)
SELECT

View file

@ -79,7 +79,7 @@
status as STATUS,
job_name AS PIPELINE
from public.etl_checkpoints
where job_name = 'job_passport'</sql>
where job_name = 'job_citizen_spouse'</sql>
<variables_active>N</variables_active>
<attributes/>
<GUI>

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -188,7 +188,7 @@ result_max as ( --костыль
),
for_checkpoints as (
SELECT
'passport_flow1' as job_name,
'citizen_spouse_flow1' as job_name,
idm_flow1 as last_recruitment_id,
cr_flow1 as recruitment_created_date,
'ERROR' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -188,7 +188,7 @@ result_max as ( --костыль
),
for_checkpoints as (
SELECT
'passport_flow1' as job_name,
'citizen_spouse_flow1' as job_name,
idm_flow1 as last_recruitment_id,
cr_flow1 as recruitment_created_date,
'SUCCESS' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -202,7 +202,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow2' as job_name,
'citizen_spouse_flow2' as job_name,
idm_flow2 as last_recruitment_id,
cr_flow2 as recruitment_created_date,
'ERROR' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -202,7 +202,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow2' as job_name,
'citizen_spouse_flow2' as job_name,
idm_flow2 as last_recruitment_id,
cr_flow2 as recruitment_created_date,
'SUCCESS' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -213,7 +213,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow3' as job_name,
'citizen_spouse_flow3' as job_name,
idm_flow3 as last_recruitment_id,
cr_flow3 as recruitment_created_date,
'ERROR' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -213,7 +213,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow3' as job_name,
'citizen_spouse_flow3' as job_name,
idm_flow3 as last_recruitment_id,
cr_flow3 as recruitment_created_date,
'SUCCESS' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -224,7 +224,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow4' as job_name,
'citizen_spouse_flow4' as job_name,
idm_flow4 as last_recruitment_id,
cr_flow4 as recruitment_created_date,
'ERROR' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -224,7 +224,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow4' as job_name,
'citizen_spouse_flow4' as job_name,
idm_flow4 as last_recruitment_id,
cr_flow4 as recruitment_created_date,
'SUCCESS' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -234,7 +234,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow5' as job_name,
'citizen_spouse_flow5' as job_name,
idm_flow5 as last_recruitment_id,
cr_flow5 as recruitment_created_date,
'ERROR' as status,

View file

@ -119,7 +119,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (
SELECT
@ -234,7 +234,7 @@ for_checkpoints as (
union all
*/
SELECT
'passport_flow5' as job_name,
'citizen_spouse_flow5' as job_name,
idm_flow5 as last_recruitment_id,
cr_flow5 as recruitment_created_date,
'SUCCESS' as status,

View file

@ -85,14 +85,14 @@
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql> SELECT
'delta_passport' as job_name,
'delta_citizen_spouse' as job_name,
'ERROR' as status,
current_timestamp as record_created
union all
SELECT
'job_passport' as job_name,
'job_citizen_spouse' as job_name,
'ERROR' as status,
current_timestamp as record_created

View file

@ -85,14 +85,14 @@
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql> SELECT
'delta_passport' as job_name,
'delta_citizen_spouse' as job_name,
'SUCCESS' as status,
current_timestamp as record_created
union all
SELECT
'job_passport' as job_name,
'job_citizen_spouse' as job_name,
'SUCCESS' as status,
current_timestamp as record_created

View file

@ -86,7 +86,7 @@
<limit>0</limit>
<sql>SELECT
'PROCESSING' AS status,
'job_passport' AS job_name,
'job_citizen_spouse' AS job_name,
current_timestamp AS record_created
--FROM public.etl_checkpoints
@ -94,7 +94,7 @@ UNION ALL
SELECT
'PROCESSING' AS status,
'passport_flow1' AS job_name,
'citizen_spouse_flow1' AS job_name,
current_timestamp AS record_created
--FROM public.etl_checkpoints
@ -102,7 +102,7 @@ UNION ALL
SELECT
'PROCESSING' AS status,
'passport_flow2' AS job_name,
'citizen_spouse_flow2' AS job_name,
current_timestamp AS record_created
--FROM public.etl_checkpoints
@ -110,7 +110,7 @@ UNION ALL
SELECT
'PROCESSING' AS status,
'passport_flow3' AS job_name,
'citizen_spouse_flow3' AS job_name,
current_timestamp AS record_created
--FROM public.etl_checkpoints
@ -118,7 +118,7 @@ UNION ALL
SELECT
'PROCESSING' AS status,
'passport_flow4' AS job_name,
'citizen_spouse_flow4' AS job_name,
current_timestamp AS record_created
--FROM public.etl_checkpoints
@ -126,7 +126,7 @@ UNION ALL
SELECT
'PROCESSING' AS status,
'passport_flow5' AS job_name,
'citizen_spouse_flow5' AS job_name,
current_timestamp AS record_created
--FROM public.etl_checkpoints</sql>
<variables_active>N</variables_active>

View file

@ -86,7 +86,7 @@
<limit>0</limit>
<sql>SELECT
'PROCESSING' AS status,
'delta_passport' AS job_name,
'delta_citizen_spouse' AS job_name,
current_timestamp AS record_created
--FROM public.etl_checkpoints</sql>
<variables_active>N</variables_active>

View file

@ -76,13 +76,13 @@
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
COALESCE(job_name, 'job_passport') AS job_name,
COALESCE(job_name, 'job_citizen_spouse') AS job_name,
COALESCE(status, 'NEW') AS status,
current_timestamp::timestamp as record_created
FROM (
SELECT job_name, status
FROM public.etl_checkpoints
WHERE job_name = 'job_passport'
WHERE job_name = 'job_citizen_spouse'
UNION ALL
@ -90,7 +90,7 @@ FROM (
WHERE NOT EXISTS (
SELECT 1
FROM public.etl_checkpoints
WHERE job_name = 'job_passport'
WHERE job_name = 'job_citizen_spouse'
)
) t</sql>
<variables_active>N</variables_active>

View file

@ -830,25 +830,25 @@
<sql>WITH status_check AS (
SELECT
bool_or(status = 'ERROR' AND job_name IN (
'passport_flow1',
'passport_flow2',
'passport_flow3',
'passport_flow4',
'passport_flow5'
'citizen_spouse_flow1',
'citizen_spouse_flow2',
'citizen_spouse_flow3',
'citizen_spouse_flow4',
'citizen_spouse_flow5'
)) AS has_error,
count(*) FILTER (
WHERE status = 'SUCCESS' AND job_name IN (
'passport_flow1',
'passport_flow2',
'passport_flow3',
'passport_flow4',
'passport_flow5'
'citizen_spouse_flow1',
'citizen_spouse_flow2',
'citizen_spouse_flow3',
'citizen_spouse_flow4',
'citizen_spouse_flow5'
)
) = 5 AS all_success
FROM public.etl_checkpoints
)
SELECT
'job_passport' as job_name,
'job_citizen_spouse' as job_name,
CASE
WHEN has_error THEN 'ERROR'
WHEN all_success THEN 'SUCCESS'

View file

@ -40,25 +40,50 @@
<connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
r.recruit_id AS recruit_id,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' AS passport_number,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok' AS passport_series,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'vydDok' AS organization_name,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodVydDok' AS unit_code,
TO_DATE(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'dataDok', 'YYYY-MM-DD') AS issue_date,
CASE
WHEN ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodStatus' = '1'
THEN TRUE ELSE FALSE
END AS actual
FROM ervu_dashboard.recruits_info ri
--join public.recruits r on r.id = ri.recruit_id
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
AND ri.updated_at >= '${M_R_UP_DATE}'::timestamp
WHERE ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' IS NOT NULL
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok') = 4
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok') = 6</sql>
<sql>WITH suprug AS (
SELECT
supr.supri AS supr,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend' AS marriage_date,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend' AS divorce_date,
CASE
WHEN (ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1') THEN true
ELSE false
END AS information_excluded,
ri.recruit_id
FROM ervu_dashboard.recruits_info ri
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id --AND '${ID_F1}' != '' -- Проверка на пустую строку
--AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F1}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
AND ri.updated_at >= '${M_R_UP_DATE}'::timestamp
JOIN LATERAL (
SELECT jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
) AS supr ON true
)
SELECT
r.recruit_id AS recruit_id,
supr->>'rodstvSvyazSuprugNaim' AS kinship_type,
CONCAT_WS(' ',
supr->'svedFLBS'->'fio'->>'familiya',
supr->'svedFLBS'->'fio'->>'imya',
supr->'svedFLBS'->'fio'->>'otchestvo'
) AS full_name,
MAKE_DATE(
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz','')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den','')::int
) AS birth_date,
(supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
supr->'svedSmert'->>'nomerZapis' AS death_az_number,
marriage_az_number,
marriage_date::date,
divorce_az_number,
divorce_date::date,
information_excluded
FROM ervu_dashboard.citizen r
JOIN suprug ON r.recruit_id = suprug.recruit_id</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>
@ -86,52 +111,67 @@ AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok')
<name>recruit_id</name>
</key>
<schema>ervu_dashboard</schema>
<table>passport</table>
<table>citizen_spouse</table>
<value>
<name>recruit_id</name>
<rename>recruit_id</rename>
<update>N</update>
</value>
<value>
<name>actual</name>
<rename>actual</rename>
<name>kinship_type</name>
<rename>kinship_type</rename>
<update>Y</update>
</value>
<value>
<name>issue_date</name>
<rename>issue_date</rename>
<name>full_name</name>
<rename>full_name</rename>
<update>Y</update>
</value>
<value>
<name>organization_name</name>
<rename>organization_name</rename>
<name>birth_date</name>
<rename>birth_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_number</name>
<rename>passport_number</rename>
<name>death_date</name>
<rename>death_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_series</name>
<rename>passport_series</rename>
<name>death_az_number</name>
<rename>death_az_number</rename>
<update>Y</update>
</value>
<value>
<name>type_dul</name>
<rename>type_dul</rename>
<name>marriage_az_number</name>
<rename>marriage_az_number</rename>
<update>Y</update>
</value>
<value>
<name>unit_code</name>
<rename>unit_code</rename>
<name>marriage_date</name>
<rename>marriage_date</rename>
<update>Y</update>
</value>
<value>
<name>divorce_az_number</name>
<rename>divorce_az_number</rename>
<update>Y</update>
</value>
<value>
<name>divorce_date</name>
<rename>divorce_date</rename>
<update>Y</update>
</value>
<value>
<name>information_excluded</name>
<rename>information_excluded</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
<GUI>
<xloc>1088</xloc>
<xloc>1024</xloc>
<yloc>352</yloc>
</GUI>
</transform>

View file

@ -85,45 +85,60 @@
<name2/>
</key>
<schema>ervu_dashboard</schema>
<table>passport</table>
<table>citizen_spouse</table>
<value>
<name>recruit_id</name>
<rename>recruit_id</rename>
<update>N</update>
</value>
<value>
<name>actual</name>
<rename>actual</rename>
<name>kinship_type</name>
<rename>kinship_type</rename>
<update>Y</update>
</value>
<value>
<name>issue_date</name>
<rename>issue_date</rename>
<name>full_name</name>
<rename>full_name</rename>
<update>Y</update>
</value>
<value>
<name>organization_name</name>
<rename>organization_name</rename>
<name>birth_date</name>
<rename>birth_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_number</name>
<rename>passport_number</rename>
<name>death_date</name>
<rename>death_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_series</name>
<rename>passport_series</rename>
<name>death_az_number</name>
<rename>death_az_number</rename>
<update>Y</update>
</value>
<value>
<name>type_dul</name>
<rename>type_dul</rename>
<name>marriage_az_number</name>
<rename>marriage_az_number</rename>
<update>Y</update>
</value>
<value>
<name>unit_code</name>
<rename>unit_code</rename>
<name>marriage_date</name>
<rename>marriage_date</rename>
<update>Y</update>
</value>
<value>
<name>divorce_az_number</name>
<rename>divorce_az_number</rename>
<update>Y</update>
</value>
<value>
<name>divorce_date</name>
<rename>divorce_date</rename>
<update>Y</update>
</value>
<value>
<name>information_excluded</name>
<rename>information_excluded</rename>
<update>Y</update>
</value>
</lookup>
@ -185,25 +200,49 @@
<connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
r.recruit_id AS recruit_id,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' AS passport_number,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok' AS passport_series,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'vydDok' AS organization_name,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodVydDok' AS unit_code,
TO_DATE(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'dataDok', 'YYYY-MM-DD') AS issue_date,
CASE
WHEN ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodStatus' = '1'
THEN TRUE ELSE FALSE
END AS actual
FROM ervu_dashboard.recruits_info ri
--join public.recruits r on r.id = ri.recruit_id
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F1}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F1}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
WHERE ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' IS NOT NULL
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok') = 4
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok') = 6</sql>
<sql>WITH suprug AS (
SELECT
supr.supri AS supr,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend' AS marriage_date,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend' AS divorce_date,
CASE
WHEN (ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1') THEN true
ELSE false
END AS information_excluded,
ri.recruit_id
FROM ervu_dashboard.recruits_info ri
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F1}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F1}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
JOIN LATERAL (
SELECT jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
) AS supr ON true
)
SELECT
r.recruit_id AS recruit_id,
supr->>'rodstvSvyazSuprugNaim' AS kinship_type,
CONCAT_WS(' ',
supr->'svedFLBS'->'fio'->>'familiya',
supr->'svedFLBS'->'fio'->>'imya',
supr->'svedFLBS'->'fio'->>'otchestvo'
) AS full_name,
MAKE_DATE(
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz','')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den','')::int
) AS birth_date,
(supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
supr->'svedSmert'->>'nomerZapis' AS death_az_number,
marriage_az_number,
marriage_date::date,
divorce_az_number,
divorce_date::date,
information_excluded
FROM ervu_dashboard.citizen r
JOIN suprug ON r.recruit_id = suprug.recruit_id</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>

View file

@ -46,53 +46,68 @@
<name>recruit_id</name>
</key>
<schema>ervu_dashboard</schema>
<table>passport</table>
<table>citizen_spouse</table>
<value>
<name>recruit_id</name>
<rename>recruit_id</rename>
<update>N</update>
</value>
<value>
<name>actual</name>
<rename>actual</rename>
<name>kinship_type</name>
<rename>kinship_type</rename>
<update>Y</update>
</value>
<value>
<name>issue_date</name>
<rename>issue_date</rename>
<name>full_name</name>
<rename>full_name</rename>
<update>Y</update>
</value>
<value>
<name>organization_name</name>
<rename>organization_name</rename>
<name>birth_date</name>
<rename>birth_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_number</name>
<rename>passport_number</rename>
<name>death_date</name>
<rename>death_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_series</name>
<rename>passport_series</rename>
<name>death_az_number</name>
<rename>death_az_number</rename>
<update>Y</update>
</value>
<value>
<name>type_dul</name>
<rename>type_dul</rename>
<name>marriage_az_number</name>
<rename>marriage_az_number</rename>
<update>Y</update>
</value>
<value>
<name>unit_code</name>
<rename>unit_code</rename>
<name>marriage_date</name>
<rename>marriage_date</rename>
<update>Y</update>
</value>
<value>
<name>divorce_az_number</name>
<rename>divorce_az_number</rename>
<update>Y</update>
</value>
<value>
<name>divorce_date</name>
<rename>divorce_date</rename>
<update>Y</update>
</value>
<value>
<name>information_excluded</name>
<rename>information_excluded</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
<GUI>
<xloc>1216</xloc>
<yloc>416</yloc>
<xloc>1280</xloc>
<yloc>352</yloc>
</GUI>
</transform>
<transform>
@ -109,30 +124,54 @@
<connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
r.recruit_id AS recruit_id,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' AS passport_number,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok' AS passport_series,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'vydDok' AS organization_name,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodVydDok' AS unit_code,
TO_DATE(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'dataDok', 'YYYY-MM-DD') AS issue_date,
CASE
WHEN ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodStatus' = '1'
THEN TRUE ELSE FALSE
END AS actual
FROM ervu_dashboard.recruits_info ri
--join public.recruits r on r.id = ri.recruit_id
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F2}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F2}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
WHERE ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' IS NOT NULL
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok') = 4
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok') = 6</sql>
<sql>WITH suprug AS (
SELECT
supr.supri AS supr,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend' AS marriage_date,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend' AS divorce_date,
CASE
WHEN (ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1') THEN true
ELSE false
END AS information_excluded,
ri.recruit_id
FROM ervu_dashboard.recruits_info ri
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F2}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F2}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
JOIN LATERAL (
SELECT jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
) AS supr ON true
)
SELECT
r.recruit_id AS recruit_id,
supr->>'rodstvSvyazSuprugNaim' AS kinship_type,
CONCAT_WS(' ',
supr->'svedFLBS'->'fio'->>'familiya',
supr->'svedFLBS'->'fio'->>'imya',
supr->'svedFLBS'->'fio'->>'otchestvo'
) AS full_name,
MAKE_DATE(
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz','')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den','')::int
) AS birth_date,
(supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
supr->'svedSmert'->>'nomerZapis' AS death_az_number,
marriage_az_number,
marriage_date::date,
divorce_az_number,
divorce_date::date,
information_excluded
FROM ervu_dashboard.citizen r
JOIN suprug ON r.recruit_id = suprug.recruit_id</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>
<xloc>720</xloc>
<yloc>416</yloc>
<xloc>784</xloc>
<yloc>352</yloc>
</GUI>
</transform>
<transform_error_handling>

View file

@ -46,53 +46,68 @@
<name>recruit_id</name>
</key>
<schema>ervu_dashboard</schema>
<table>passport</table>
<table>citizen_spouse</table>
<value>
<name>recruit_id</name>
<rename>recruit_id</rename>
<update>N</update>
</value>
<value>
<name>actual</name>
<rename>actual</rename>
<name>kinship_type</name>
<rename>kinship_type</rename>
<update>Y</update>
</value>
<value>
<name>issue_date</name>
<rename>issue_date</rename>
<name>full_name</name>
<rename>full_name</rename>
<update>Y</update>
</value>
<value>
<name>organization_name</name>
<rename>organization_name</rename>
<name>birth_date</name>
<rename>birth_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_number</name>
<rename>passport_number</rename>
<name>death_date</name>
<rename>death_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_series</name>
<rename>passport_series</rename>
<name>death_az_number</name>
<rename>death_az_number</rename>
<update>Y</update>
</value>
<value>
<name>type_dul</name>
<rename>type_dul</rename>
<name>marriage_az_number</name>
<rename>marriage_az_number</rename>
<update>Y</update>
</value>
<value>
<name>unit_code</name>
<rename>unit_code</rename>
<name>marriage_date</name>
<rename>marriage_date</rename>
<update>Y</update>
</value>
<value>
<name>divorce_az_number</name>
<rename>divorce_az_number</rename>
<update>Y</update>
</value>
<value>
<name>divorce_date</name>
<rename>divorce_date</rename>
<update>Y</update>
</value>
<value>
<name>information_excluded</name>
<rename>information_excluded</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
<GUI>
<xloc>1280</xloc>
<yloc>432</yloc>
<xloc>1152</xloc>
<yloc>336</yloc>
</GUI>
</transform>
<transform>
@ -109,30 +124,54 @@
<connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
r.recruit_id AS recruit_id,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' AS passport_number,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok' AS passport_series,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'vydDok' AS organization_name,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodVydDok' AS unit_code,
TO_DATE(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'dataDok', 'YYYY-MM-DD') AS issue_date,
CASE
WHEN ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodStatus' = '1'
THEN TRUE ELSE FALSE
END AS actual
FROM ervu_dashboard.recruits_info ri
--join public.recruits r on r.id = ri.recruit_id
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F3}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F3}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
WHERE ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' IS NOT NULL
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok') = 4
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok') = 6</sql>
<sql>WITH suprug AS (
SELECT
supr.supri AS supr,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend' AS marriage_date,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend' AS divorce_date,
CASE
WHEN (ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1') THEN true
ELSE false
END AS information_excluded,
ri.recruit_id
FROM ervu_dashboard.recruits_info ri
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F3}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F3}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
JOIN LATERAL (
SELECT jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
) AS supr ON true
)
SELECT
r.recruit_id AS recruit_id,
supr->>'rodstvSvyazSuprugNaim' AS kinship_type,
CONCAT_WS(' ',
supr->'svedFLBS'->'fio'->>'familiya',
supr->'svedFLBS'->'fio'->>'imya',
supr->'svedFLBS'->'fio'->>'otchestvo'
) AS full_name,
MAKE_DATE(
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz','')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den','')::int
) AS birth_date,
(supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
supr->'svedSmert'->>'nomerZapis' AS death_az_number,
marriage_az_number,
marriage_date::date,
divorce_az_number,
divorce_date::date,
information_excluded
FROM ervu_dashboard.citizen r
JOIN suprug ON r.recruit_id = suprug.recruit_id</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>
<xloc>784</xloc>
<yloc>432</yloc>
<xloc>656</xloc>
<yloc>336</yloc>
</GUI>
</transform>
<transform_error_handling>

View file

@ -46,53 +46,68 @@
<name>recruit_id</name>
</key>
<schema>ervu_dashboard</schema>
<table>passport</table>
<table>citizen_spouse</table>
<value>
<name>recruit_id</name>
<rename>recruit_id</rename>
<update>N</update>
</value>
<value>
<name>actual</name>
<rename>actual</rename>
<name>kinship_type</name>
<rename>kinship_type</rename>
<update>Y</update>
</value>
<value>
<name>issue_date</name>
<rename>issue_date</rename>
<name>full_name</name>
<rename>full_name</rename>
<update>Y</update>
</value>
<value>
<name>organization_name</name>
<rename>organization_name</rename>
<name>birth_date</name>
<rename>birth_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_number</name>
<rename>passport_number</rename>
<name>death_date</name>
<rename>death_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_series</name>
<rename>passport_series</rename>
<name>death_az_number</name>
<rename>death_az_number</rename>
<update>Y</update>
</value>
<value>
<name>type_dul</name>
<rename>type_dul</rename>
<name>marriage_az_number</name>
<rename>marriage_az_number</rename>
<update>Y</update>
</value>
<value>
<name>unit_code</name>
<rename>unit_code</rename>
<name>marriage_date</name>
<rename>marriage_date</rename>
<update>Y</update>
</value>
<value>
<name>divorce_az_number</name>
<rename>divorce_az_number</rename>
<update>Y</update>
</value>
<value>
<name>divorce_date</name>
<rename>divorce_date</rename>
<update>Y</update>
</value>
<value>
<name>information_excluded</name>
<rename>information_excluded</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
<GUI>
<xloc>1280</xloc>
<yloc>448</yloc>
<xloc>1184</xloc>
<yloc>384</yloc>
</GUI>
</transform>
<transform>
@ -109,30 +124,54 @@
<connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
r.recruit_id AS recruit_id,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' AS passport_number,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok' AS passport_series,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'vydDok' AS organization_name,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodVydDok' AS unit_code,
TO_DATE(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'dataDok', 'YYYY-MM-DD') AS issue_date,
CASE
WHEN ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodStatus' = '1'
THEN TRUE ELSE FALSE
END AS actual
FROM ervu_dashboard.recruits_info ri
--join public.recruits r on r.id = ri.recruit_id
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F4}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F4}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
WHERE ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' IS NOT NULL
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok') = 4
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok') = 6</sql>
<sql>WITH suprug AS (
SELECT
supr.supri AS supr,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend' AS marriage_date,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend' AS divorce_date,
CASE
WHEN (ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1') THEN true
ELSE false
END AS information_excluded,
ri.recruit_id
FROM ervu_dashboard.recruits_info ri
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F4}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F4}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
JOIN LATERAL (
SELECT jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
) AS supr ON true
)
SELECT
r.recruit_id AS recruit_id,
supr->>'rodstvSvyazSuprugNaim' AS kinship_type,
CONCAT_WS(' ',
supr->'svedFLBS'->'fio'->>'familiya',
supr->'svedFLBS'->'fio'->>'imya',
supr->'svedFLBS'->'fio'->>'otchestvo'
) AS full_name,
MAKE_DATE(
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz','')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den','')::int
) AS birth_date,
(supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
supr->'svedSmert'->>'nomerZapis' AS death_az_number,
marriage_az_number,
marriage_date::date,
divorce_az_number,
divorce_date::date,
information_excluded
FROM ervu_dashboard.citizen r
JOIN suprug ON r.recruit_id = suprug.recruit_id</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>
<xloc>784</xloc>
<yloc>448</yloc>
<xloc>688</xloc>
<yloc>384</yloc>
</GUI>
</transform>
<transform_error_handling>

View file

@ -46,53 +46,68 @@
<name>recruit_id</name>
</key>
<schema>ervu_dashboard</schema>
<table>passport</table>
<table>citizen_spouse</table>
<value>
<name>recruit_id</name>
<rename>recruit_id</rename>
<update>N</update>
</value>
<value>
<name>actual</name>
<rename>actual</rename>
<name>kinship_type</name>
<rename>kinship_type</rename>
<update>Y</update>
</value>
<value>
<name>issue_date</name>
<rename>issue_date</rename>
<name>full_name</name>
<rename>full_name</rename>
<update>Y</update>
</value>
<value>
<name>organization_name</name>
<rename>organization_name</rename>
<name>birth_date</name>
<rename>birth_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_number</name>
<rename>passport_number</rename>
<name>death_date</name>
<rename>death_date</rename>
<update>Y</update>
</value>
<value>
<name>passport_series</name>
<rename>passport_series</rename>
<name>death_az_number</name>
<rename>death_az_number</rename>
<update>Y</update>
</value>
<value>
<name>type_dul</name>
<rename>type_dul</rename>
<name>marriage_az_number</name>
<rename>marriage_az_number</rename>
<update>Y</update>
</value>
<value>
<name>unit_code</name>
<rename>unit_code</rename>
<name>marriage_date</name>
<rename>marriage_date</rename>
<update>Y</update>
</value>
<value>
<name>divorce_az_number</name>
<rename>divorce_az_number</rename>
<update>Y</update>
</value>
<value>
<name>divorce_date</name>
<rename>divorce_date</rename>
<update>Y</update>
</value>
<value>
<name>information_excluded</name>
<rename>information_excluded</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
<GUI>
<xloc>1296</xloc>
<yloc>496</yloc>
<xloc>1152</xloc>
<yloc>352</yloc>
</GUI>
</transform>
<transform>
@ -109,30 +124,54 @@
<connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
r.recruit_id AS recruit_id,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' AS passport_number,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok' AS passport_series,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'vydDok' AS organization_name,
ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodVydDok' AS unit_code,
TO_DATE(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'dataDok', 'YYYY-MM-DD') AS issue_date,
CASE
WHEN ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'kodStatus' = '1'
THEN TRUE ELSE FALSE
END AS actual
FROM ervu_dashboard.recruits_info ri
--join public.recruits r on r.id = ri.recruit_id
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F5}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F5}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
WHERE ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok' IS NOT NULL
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'serDok') = 4
AND LENGTH(ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF'->>'nomDok') = 6</sql>
<sql>WITH suprug AS (
SELECT
supr.supri AS supr,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend' AS marriage_date,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend' AS divorce_date,
CASE
WHEN (ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1') THEN true
ELSE false
END AS information_excluded,
ri.recruit_id
FROM ervu_dashboard.recruits_info ri
join ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${ID_F5}' != '' -- Проверка на пустую строку
AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${ID_F5}'
AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
JOIN LATERAL (
SELECT jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
) AS supr ON true
)
SELECT
r.recruit_id AS recruit_id,
supr->>'rodstvSvyazSuprugNaim' AS kinship_type,
CONCAT_WS(' ',
supr->'svedFLBS'->'fio'->>'familiya',
supr->'svedFLBS'->'fio'->>'imya',
supr->'svedFLBS'->'fio'->>'otchestvo'
) AS full_name,
MAKE_DATE(
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz','')::int,
NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den','')::int
) AS birth_date,
(supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
supr->'svedSmert'->>'nomerZapis' AS death_az_number,
marriage_az_number,
marriage_date::date,
divorce_az_number,
divorce_date::date,
information_excluded
FROM ervu_dashboard.citizen r
JOIN suprug ON r.recruit_id = suprug.recruit_id</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>
<xloc>800</xloc>
<yloc>496</yloc>
<xloc>656</xloc>
<yloc>352</yloc>
</GUI>
</transform>
<transform_error_handling>

View file

@ -82,7 +82,7 @@ flow_ranges AS (
recr_inf AS (
SELECT DISTINCT COALESCE(cit.recruitment_id, cit.target_recruitment_id) AS idm_id
FROM ervu_dashboard.citizen cit
join ervu_dashboard.passport ch on ch.recruit_id = cit.recruit_id
join ervu_dashboard.citizen_spouse ch on ch.recruit_id = cit.recruit_id
),
flow_data AS (

View file

@ -104,18 +104,14 @@
<create_parent_folder>N</create_parent_folder>
<exec_per_row>N</exec_per_row>
<filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/job_passport.hwf</filename>
<logext/>
<logfile/>
<loglevel>Nothing</loglevel>
<parameters>
<parameter>
<name>M_R_CR_DATE</name>
<stream_name/>
<value>${M_R_CR_DATE}</value>
</parameter>
<parameter>
<name>M_R_UP_DATE</name>
<stream_name/>
<value>${M_R_UP_DATE}</value>
</parameter>
<pass_all_parameters>Y</pass_all_parameters>
@ -131,7 +127,7 @@
<attributes_hac/>
</action>
<action>
<name>Workflow 4</name>
<name>job_citizen_spouse.hwf</name>
<description/>
<type>WORKFLOW</type>
<attributes/>
@ -139,10 +135,21 @@
<add_time>N</add_time>
<create_parent_folder>N</create_parent_folder>
<exec_per_row>N</exec_per_row>
<filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/job_citizen_spouse.hwf</filename>
<loglevel>Nothing</loglevel>
<parameters>
<parameter>
<name>M_R_UP_DATE</name>
<value>${M_R_UP_DATE}</value>
</parameter>
<parameter>
<name>M_R_CR_DATE</name>
<value>${M_R_CR_DATE}</value>
</parameter>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<params_from_previous>N</params_from_previous>
<run_configuration>local</run_configuration>
<set_append_logfile>N</set_append_logfile>
<set_logfile>N</set_logfile>
<wait_until_finished>Y</wait_until_finished>
@ -291,8 +298,8 @@
</hop>
<hop>
<from>Start</from>
<to>Workflow 4</to>
<enabled>N</enabled>
<to>job_citizen_spouse.hwf</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
@ -339,7 +346,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
<from>Workflow 4</from>
<from>job_citizen_spouse.hwf</from>
<to>Success</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>

View file

@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
<pipeline>
<info>
<name>recruitment_rows_five_flow_citizen_spouse</name>
<name_sync_with_filename>Y</name_sync_with_filename>
<description/>
<extended_description/>
<pipeline_version/>
<pipeline_type>Normal</pipeline_type>
<parameters>
</parameters>
<capture_transform_performance>N</capture_transform_performance>
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
<created_user>-</created_user>
<created_date>2025/04/18 09:48:01.970</created_date>
<modified_user>-</modified_user>
<modified_date>2025/04/18 09:48:01.970</modified_date>
</info>
<notepads>
</notepads>
<order>
<hop>
<from>Table input</from>
<to>Copy rows to result</to>
<enabled>Y</enabled>
</hop>
</order>
<transform>
<name>Copy rows to result</name>
<type>RowsToResult</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<attributes/>
<GUI>
<xloc>832</xloc>
<yloc>304</yloc>
</GUI>
</transform>
<transform>
<name>Table input</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>WITH ordered AS (
SELECT
idm_id,
created_at,
ROW_NUMBER() OVER (ORDER BY created_at) AS rn,
COUNT(*) OVER () AS total_rows
from ervu_dashboard.recruitment
),
splitted AS (
SELECT *,
CEIL(total_rows / 5.0) AS part_size,
FLOOR((rn - 1) / CEIL(total_rows / 5.0)) + 1 AS flow_num,
((rn - 1) % CEIL(total_rows / 5.0)) + 1 AS position
FROM ordered
),
pivoted AS (
SELECT
position,
MAX(CASE WHEN flow_num = 1 THEN created_at END) AS cr_flow1,
MAX(CASE WHEN flow_num = 1 THEN idm_id::text END) AS idm_flow1,
MAX(CASE WHEN flow_num = 2 THEN created_at END) AS cr_flow2,
MAX(CASE WHEN flow_num = 2 THEN idm_id::text END) AS idm_flow2,
MAX(CASE WHEN flow_num = 3 THEN created_at END) AS cr_flow3,
MAX(CASE WHEN flow_num = 3 THEN idm_id::text END) AS idm_flow3,
MAX(CASE WHEN flow_num = 4 THEN created_at END) AS cr_flow4,
MAX(CASE WHEN flow_num = 4 THEN idm_id::text END) AS idm_flow4,
MAX(CASE WHEN flow_num = 5 THEN created_at END) AS cr_flow5,
MAX(CASE WHEN flow_num = 5 THEN idm_id::text END) AS idm_flow5
FROM splitted
GROUP BY position
ORDER BY position
)
SELECT
cr_flow1,
IDM_FLOW1::uuid,
cr_flow2,
IDM_FLOW2::uuid,
cr_flow3,
IDM_FLOW3::uuid,
cr_flow4,
IDM_FLOW4::uuid,
cr_flow5,
IDM_FLOW5::uuid
FROM pivoted
limit 3</sql>
<variables_active>N</variables_active>
<attributes/>
<GUI>
<xloc>464</xloc>
<yloc>304</yloc>
</GUI>
</transform>
<transform_error_handling>
</transform_error_handling>
<attributes/>
</pipeline>