change input script in citizen

mappings/info_recruits/citizen_tables/citizen/parallel/citizen_flow.hpl

@@ -290,50 +290,28 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <execute_each_row>N</execute_each_row>
     <limit/>
     <sql>SELECT
-    r.system_pgs_status,	
+    r.system_pgs_status,
-    r.full_name, 
+    r.full_name,
-    r.last_name, 
+    r.last_name,
-    r.first_name, 
+    r.first_name,
-    r.middle_name, 
+    r.middle_name,
     r.gender,
-    --ri.info->'svedFL'->'svedBS'->'snils'->'aktSNILS'->>'snils' AS snils,
+    r.birth_date,
-    --ri.info->'svedFL'->'svedBS'->'inn'->'aktINN'->>'inn' AS inn,
-    r.birth_date,  
     EXTRACT(YEAR FROM AGE(r.birth_date)) AS age,
     r.birth_place,
     r.phone,
     r.email,
-    r.id AS recruit_id, --ri.recruit_id,
+    r.id AS recruit_id,
-    --ri.info,
     r.vu_current_info,
-	r.military_registration_date AS date_registration,
+    r.military_registration_date AS date_registration,
-	r.vu_unset_date AS date_deregistration,
+    r.vu_unset_date AS date_deregistration,
-    NULLIF(ri.info->'svedFL'->'svedSemPolozh'->>'semPolozh','')::int AS marital_status,
+    -- NULLIF(ri.info->'svedFL'->'svedSemPolozh'->>'semPolozh','')::int AS marital_status, -- Проставлять в рамках блока семья?
-    --ri.info->'svedFL'->'pasportRF'->'aktPasportRF'->>'nomDok' AS passport_number,
-    --ri.info->'svedFL'->'pasportRF'->'aktPasportRF'->>'serDok' AS passport_series,
-    --ri.info->'svedFL'->'svedVoin'->'voin'->>'dataReg' AS issue_date,
     r.system_create_date AS recruit_create_date,
     r.system_update_date AS update_date,
     r.current_recruitment_id AS recruitment_id,
-    r.target_recruitment_id,  
+    r.target_recruitment_id,
-    --mrr.value AS reason_registration,
-    --adr.actualAddress as residence, -- адрес места жительства
-   	--adr.actualAddress_regDateStart as start_date_residence, -- дата регистрации по месту жительства
-   	--adr.actualAddress_regDateEnd as end_date_residence, -- дата снятия с регистрации по месту жительства
-   	--adr.residenceAddress as address_place_stay, -- адресс регистрации по месту пребывания
-   	--adr.residenceAddress_regDateStart as start_date_place_stay, -- дата регистрации по месту пребывания
-   	--adr.residenceAddress_regDateEnd as end_date_place_stay, -- дата снятия с регистрации по месту пребывания
-   	--case 
-   	--	when adr.residenceAddress_kodTipReg='1' then 'В жилом помещении, не являющимся местом жительства физического лица'
-    --    when adr.residenceAddress_kodTipReg='2' then 'В учреждении уголовно-исполнительной системы'
-    --   	else null 
-    --end as type_place_stay, -- тип регистрации
-    -- address_actual -- Адрес фактического проживания ***1
-    -- source_info_actual -- Источник сведений о месте фактического проживания ***1
-    -- date_info_actual -- Дата получения сведений об адресе фактического проживания ***1
-    -- date_loss_info_actual -- Дата потери актуальности сведений об адресе фактического проживания ***1
     system_id_ern AS id_ern, -- id единого регистра населения
-	ra.id_pack,
+    ra.id_pack,
     r.registered_reason,-- причина постановки на воинский учет
     (r.vu_current_info->'personalDataProcessingAgreeConfirmed')::bool AS has_agree_confirmed, -- получено согласте на обработку персональных данных
     r.vu_document_received,-- факт выдачи документа воинского учета
@@ -342,17 +320,15 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     r.source, -- источник сведений
     r.system_esia_id
 FROM public.recruits AS r
-JOIN public.recruits_info AS ri ON ri.recruit_id = r.id AND '${IDM_ID}' != ''  -- Проверка на пустую строку
+         LEFT JOIN public.recruit_association ra on ra.id_ern = r.system_id_ern
-    AND (current_recruitment_id = '${IDM_ID}' or (current_recruitment_id is null and target_recruitment_id = '${IDM_ID}'))
+--          LEFT JOIN (
-LEFT JOIN (
+--     SELECT
-    SELECT 
+--                 ROW_NUMBER() OVER (PARTITION BY recruit_id ORDER BY created_at DESC) as rn,
-        ROW_NUMBER() OVER (PARTITION BY recruit_id ORDER BY created_at DESC) as rn,
+--                 recruit_id,
-        recruit_id,
+--                 hidden
-        hidden
+--     FROM public.decision_deferment_dto
-    FROM public.decision_deferment_dto 
+-- ) ddd ON ddd.recruit_id = r.id and ddd.rn = 1 and ddd.hidden is false
-    ) ddd ON ddd.recruit_id = r.id and ddd.rn = 1 and ddd.hidden is false 
+where current_recruitment_id = '${IDM_ID}' or (current_recruitment_id is null and target_recruitment_id = '${IDM_ID}');</sql>
-LEFT JOIN public.recruit_association ra on ra.id_ern = r.system_id_ern
-</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>