Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Fusionshh 2025-10-22 14:44:27 +03:00
commit 65997e3cd2
15 changed files with 57 additions and 23 deletions

View file

@ -310,7 +310,6 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH children_data AS ( <sql>WITH children_data AS (
SELECT SELECT
ri.recruit_id AS recruit_id, ri.recruit_id AS recruit_id,
@ -468,11 +467,13 @@ FROM children_data;</sql>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>Y</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -406,7 +406,6 @@ and recruitment_id = '${IDM_ID}';</sql>
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH children_data AS ( <sql>WITH children_data AS (
SELECT SELECT
ri.recruit_id AS recruit_id, ri.recruit_id AS recruit_id,
@ -483,11 +482,13 @@ FROM children_data;</sql>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>Y</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -497,11 +497,13 @@ FROM children_data;</sql>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>Y</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -418,16 +418,19 @@ FROM guardianship_data;</sql>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>Y</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>is_guardian</field> <field>is_guardian</field>
<name>is_guardian</name> <name>is_guardian</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -433,16 +433,19 @@ FROM guardianship_data;</sql>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>Y</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>is_guardian</field> <field>is_guardian</field>
<name>is_guardian</name> <name>is_guardian</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -448,16 +448,19 @@ FROM guardianship_data;</sql>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>Y</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>is_guardian</field> <field>is_guardian</field>
<name>is_guardian</name> <name>is_guardian</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -358,17 +358,20 @@ FROM wanted_data;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>is_wanted</field> <field>is_wanted</field>
<name>is_wanted</name> <name>is_wanted</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>
@ -378,7 +381,7 @@ FROM wanted_data;</sql>
</value> </value>
</lookup> </lookup>
<skip_lookup>N</skip_lookup> <skip_lookup>N</skip_lookup>
<use_batch>N</use_batch> <use_batch>Y</use_batch>
<attributes/> <attributes/>
<GUI> <GUI>
<xloc>336</xloc> <xloc>336</xloc>

View file

@ -364,17 +364,20 @@ FROM wanted_data;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>is_wanted</field> <field>is_wanted</field>
<name>is_wanted</name> <name>is_wanted</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>
@ -384,7 +387,7 @@ FROM wanted_data;</sql>
</value> </value>
</lookup> </lookup>
<skip_lookup>N</skip_lookup> <skip_lookup>N</skip_lookup>
<use_batch>N</use_batch> <use_batch>Y</use_batch>
<attributes/> <attributes/>
<GUI> <GUI>
<xloc>400</xloc> <xloc>400</xloc>

View file

@ -336,7 +336,6 @@ DO UPDATE SET
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH wanted_data AS ( <sql>WITH wanted_data AS (
SELECT SELECT
ri.recruit_id, ri.recruit_id,
@ -378,17 +377,20 @@ FROM wanted_data;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>is_wanted</field> <field>is_wanted</field>
<name>is_wanted</name> <name>is_wanted</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>
@ -398,7 +400,7 @@ FROM wanted_data;</sql>
</value> </value>
</lookup> </lookup>
<skip_lookup>N</skip_lookup> <skip_lookup>N</skip_lookup>
<use_batch>N</use_batch> <use_batch>Y</use_batch>
<attributes/> <attributes/>
<GUI> <GUI>
<xloc>416</xloc> <xloc>416</xloc>

View file

@ -294,7 +294,6 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH ugolov_presl AS ( <sql>WITH ugolov_presl AS (
SELECT SELECT
jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up, jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up,
@ -479,7 +478,7 @@ GROUP BY r.recruit_id, up.up, up.source_ctid;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>

View file

@ -436,7 +436,6 @@ and recruitment_id = '${IDM_ID}';</sql>
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH ugolov_presl AS ( <sql>WITH ugolov_presl AS (
SELECT SELECT
jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up, jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up,
@ -504,17 +503,20 @@ GROUP BY r.recruit_id, up.up, up.source_ctid;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_criminal_prosecution</field> <field>has_criminal_prosecution</field>
<name>has_criminal_prosecution</name> <name>has_criminal_prosecution</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -450,7 +450,6 @@ DO UPDATE SET
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH ugolov_presl AS ( <sql>WITH ugolov_presl AS (
SELECT SELECT
jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up, jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up,
@ -517,17 +516,20 @@ GROUP BY r.recruit_id, up.up, up.source_ctid;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_criminal_prosecution</field> <field>has_criminal_prosecution</field>
<name>has_criminal_prosecution</name> <name>has_criminal_prosecution</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>

View file

@ -294,7 +294,6 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH punishment_data AS ( <sql>WITH punishment_data AS (
SELECT SELECT
ri.recruit_id, ri.recruit_id,
@ -471,22 +470,26 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_punishment_execution_info</field> <field>has_punishment_execution_info</field>
<name>has_punishment_execution_info</name> <name>has_punishment_execution_info</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_sentence_info</field> <field>has_sentence_info</field>
<name>has_sentence_info</name> <name>has_sentence_info</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>
@ -500,7 +503,7 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
</value> </value>
</lookup> </lookup>
<skip_lookup>N</skip_lookup> <skip_lookup>N</skip_lookup>
<use_batch>N</use_batch> <use_batch>Y</use_batch>
<attributes/> <attributes/>
<GUI> <GUI>
<xloc>1008</xloc> <xloc>1008</xloc>

View file

@ -512,22 +512,26 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_punishment_execution_info</field> <field>has_punishment_execution_info</field>
<name>has_punishment_execution_info</name> <name>has_punishment_execution_info</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_sentence_info</field> <field>has_sentence_info</field>
<name>has_sentence_info</name> <name>has_sentence_info</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>
@ -541,7 +545,7 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
</value> </value>
</lookup> </lookup>
<skip_lookup>N</skip_lookup> <skip_lookup>N</skip_lookup>
<use_batch>N</use_batch> <use_batch>Y</use_batch>
<attributes/> <attributes/>
<GUI> <GUI>
<xloc>960</xloc> <xloc>960</xloc>

View file

@ -440,7 +440,6 @@ DO UPDATE SET
</partitioning> </partitioning>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<limit/>
<sql>WITH punishment_data AS ( <sql>WITH punishment_data AS (
SELECT SELECT
ri.recruit_id, ri.recruit_id,
@ -507,22 +506,26 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
</partitioning> </partitioning>
<commit>10000</commit> <commit>10000</commit>
<connection>ervu-dashboard</connection> <connection>ervu-dashboard</connection>
<error_ignored>N</error_ignored> <error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup> <lookup>
<key> <key>
<condition>=</condition> <condition>=</condition>
<field>recruit_id</field> <field>recruit_id</field>
<name>recruit_id</name> <name>recruit_id</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_punishment_execution_info</field> <field>has_punishment_execution_info</field>
<name>has_punishment_execution_info</name> <name>has_punishment_execution_info</name>
<name2/>
</key> </key>
<key> <key>
<condition>&lt;></condition> <condition>&lt;></condition>
<field>has_sentence_info</field> <field>has_sentence_info</field>
<name>has_sentence_info</name> <name>has_sentence_info</name>
<name2/>
</key> </key>
<schema>ervu_dashboard</schema> <schema>ervu_dashboard</schema>
<table>citizen</table> <table>citizen</table>
@ -536,7 +539,7 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
</value> </value>
</lookup> </lookup>
<skip_lookup>N</skip_lookup> <skip_lookup>N</skip_lookup>
<use_batch>N</use_batch> <use_batch>Y</use_batch>
<attributes/> <attributes/>
<GUI> <GUI>
<xloc>992</xloc> <xloc>992</xloc>