+info_recruits

This commit is contained in:
Ruslan 2024-09-06 16:26:47 +03:00
parent 5a93e2bf48
commit ff00a27b65
19 changed files with 10329 additions and 395 deletions

View file

@ -66,9 +66,9 @@
<slaveservers>
</slaveservers>
<job-log-table>
<connection/>
<schema/>
<table/>
<connection>ervu-dashboard</connection>
<schema>public</schema>
<table>job_log</table>
<size_limit_lines/>
<interval/>
<timeout_days/>
@ -394,7 +394,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>48</yloc>
<attributes_kjc/>
</entry>
@ -406,7 +406,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>48</yloc>
<attributes_kjc/>
</entry>
@ -444,7 +444,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>128</yloc>
<attributes_kjc/>
</entry>
@ -456,7 +456,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>128</yloc>
<attributes_kjc/>
</entry>
@ -494,7 +494,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>192</yloc>
<attributes_kjc/>
</entry>
@ -506,7 +506,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>192</yloc>
<attributes_kjc/>
</entry>
@ -544,7 +544,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>272</yloc>
<attributes_kjc/>
</entry>
@ -556,7 +556,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>272</yloc>
<attributes_kjc/>
</entry>
@ -594,7 +594,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>352</yloc>
<attributes_kjc/>
</entry>
@ -606,7 +606,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>352</yloc>
<attributes_kjc/>
</entry>
@ -644,7 +644,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>432</yloc>
<attributes_kjc/>
</entry>
@ -656,7 +656,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>432</yloc>
<attributes_kjc/>
</entry>
@ -694,7 +694,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>512</yloc>
<attributes_kjc/>
</entry>
@ -706,7 +706,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>512</yloc>
<attributes_kjc/>
</entry>
@ -744,7 +744,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>912</xloc>
<xloc>960</xloc>
<yloc>576</yloc>
<attributes_kjc/>
</entry>
@ -756,7 +756,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1088</xloc>
<xloc>1136</xloc>
<yloc>576</yloc>
<attributes_kjc/>
</entry>
@ -794,7 +794,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>704</xloc>
<xloc>960</xloc>
<yloc>640</yloc>
<attributes_kjc/>
</entry>
@ -806,7 +806,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>880</xloc>
<xloc>1136</xloc>
<yloc>640</yloc>
<attributes_kjc/>
</entry>
@ -844,8 +844,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>704</xloc>
<yloc>720</yloc>
<xloc>960</xloc>
<yloc>704</yloc>
<attributes_kjc/>
</entry>
<entry>
@ -856,8 +856,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>880</xloc>
<yloc>720</yloc>
<xloc>1136</xloc>
<yloc>704</yloc>
<attributes_kjc/>
</entry>
<entry>
@ -894,8 +894,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>704</xloc>
<yloc>800</yloc>
<xloc>960</xloc>
<yloc>768</yloc>
<attributes_kjc/>
</entry>
<entry>
@ -906,8 +906,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>880</xloc>
<yloc>800</yloc>
<xloc>1136</xloc>
<yloc>768</yloc>
<attributes_kjc/>
</entry>
<entry>
@ -1054,6 +1054,264 @@
<yloc>576</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>total_registered.marital_status</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>filename</specification_method>
<trans_object_id/>
<filename>${Internal.Entry.Current.Directory}/total_registered.marital_status.ktr</filename>
<transname/>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>Y</params_from_previous>
<exec_per_row>N</exec_per_row>
<clear_rows>N</clear_rows>
<clear_files>N</clear_files>
<set_logfile>N</set_logfile>
<logfile/>
<logext/>
<add_date>N</add_date>
<add_time>N</add_time>
<loglevel>Basic</loglevel>
<cluster>N</cluster>
<slave_server_name/>
<set_append_logfile>N</set_append_logfile>
<wait_until_finished>Y</wait_until_finished>
<follow_abort_remote>N</follow_abort_remote>
<create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>960</xloc>
<yloc>832</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>Success 13</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1136</xloc>
<yloc>832</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>SQL.totreg.marstat</name>
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.marital_status where recruitment_id = '00'</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
<sendOneStatement>F</sendOneStatement>
<connection>ervu-dashboard</connection>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>768</xloc>
<yloc>832</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>SQL.totreg.chimin</name>
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.child_minor where recruitment_id = '00'</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
<sendOneStatement>F</sendOneStatement>
<connection>ervu-dashboard</connection>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>768</xloc>
<yloc>704</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>SQL.totreg.age</name>
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.age where recruitment_id = '00'</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
<sendOneStatement>F</sendOneStatement>
<connection>ervu-dashboard</connection>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>768</xloc>
<yloc>768</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>SQL.totreg.drilic</name>
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.driver_license where recruitment_id = '00'</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
<sendOneStatement>F</sendOneStatement>
<connection>ervu-dashboard</connection>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>768</xloc>
<yloc>640</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>total_registered.education_level</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>filename</specification_method>
<trans_object_id/>
<filename>${Internal.Entry.Current.Directory}/total_registered.education_level.ktr</filename>
<transname/>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>Y</params_from_previous>
<exec_per_row>N</exec_per_row>
<clear_rows>N</clear_rows>
<clear_files>N</clear_files>
<set_logfile>N</set_logfile>
<logfile/>
<logext/>
<add_date>N</add_date>
<add_time>N</add_time>
<loglevel>Basic</loglevel>
<cluster>N</cluster>
<slave_server_name/>
<set_append_logfile>N</set_append_logfile>
<wait_until_finished>Y</wait_until_finished>
<follow_abort_remote>N</follow_abort_remote>
<create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>960</xloc>
<yloc>912</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>Success 14</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1136</xloc>
<yloc>912</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>SQL.totreg.edulev</name>
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.education_level where recruitment_id = '00'</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
<sendOneStatement>F</sendOneStatement>
<connection>ervu-dashboard</connection>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>768</xloc>
<yloc>912</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>total_registered.busyness</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>filename</specification_method>
<trans_object_id/>
<filename>${Internal.Entry.Current.Directory}/total_registered.busyness.ktr</filename>
<transname/>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>Y</params_from_previous>
<exec_per_row>N</exec_per_row>
<clear_rows>N</clear_rows>
<clear_files>N</clear_files>
<set_logfile>N</set_logfile>
<logfile/>
<logext/>
<add_date>N</add_date>
<add_time>N</add_time>
<loglevel>Basic</loglevel>
<cluster>N</cluster>
<slave_server_name/>
<set_append_logfile>N</set_append_logfile>
<wait_until_finished>Y</wait_until_finished>
<follow_abort_remote>N</follow_abort_remote>
<create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>960</xloc>
<yloc>992</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>Success 15</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1136</xloc>
<yloc>992</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>SQL.totreg.busyn</name>
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.busyness where recruitment_id = '00'</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
<sendOneStatement>F</sendOneStatement>
<connection>ervu-dashboard</connection>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>768</xloc>
<yloc>992</yloc>
<attributes_kjc/>
</entry>
</entries>
<hops>
<hop>
@ -1133,55 +1391,28 @@
<to>Success 10</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>N</enabled>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>total_registered.driver_license</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>N</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>total_registered.child_minor</from>
<to>Success 11</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>N</enabled>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>total_registered.child_minor</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>N</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>total_registered.age</from>
<to>Success 12</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>N</enabled>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>total_registered.age</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>N</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL.md.appeals</from>
<to>main_dashboard.appeals</to>
@ -1189,7 +1420,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1207,7 +1438,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1225,7 +1456,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1243,7 +1474,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1261,7 +1492,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1279,7 +1510,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1297,7 +1528,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1315,7 +1546,7 @@
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
@ -1326,6 +1557,141 @@
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL.totreg.marstat</from>
<to>total_registered.marital_status</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>total_registered.marital_status</from>
<to>Success 13</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>SQL.totreg.marstat</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>Start</from>
<to>SQL.totreg.chimin</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL.totreg.chimin</from>
<to>total_registered.child_minor</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>SQL.totreg.age</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL.totreg.age</from>
<to>total_registered.age</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>SQL.totreg.drilic</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL.totreg.drilic</from>
<to>total_registered.driver_license</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>SQL.totreg.edulev</from>
<to>total_registered.education_level</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>total_registered.education_level</from>
<to>Success 14</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>SQL.totreg.edulev</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>Start</from>
<to>SQL.totreg.busyn</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL.totreg.busyn</from>
<to>total_registered.busyness</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>total_registered.busyness</from>
<to>Success 15</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
</hops>
<notepads>
</notepads>

View file

@ -730,13 +730,13 @@
<connection>postgres.person_registry</connection>
<sql>with
t1 as (select count(*) total_count from public.recruits r
where r.vu_current_info -> 'isMilitaryRegistered' = 'true'),
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null),
t2 as (select count(*) filter(where gender='MALE') male_count
from public.recruits r
where r.vu_current_info -> 'isMilitaryRegistered' = 'true'),
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null),
t3 as (select count(*) filter(where gender='FEMALE') female_count
from public.recruits r
where r.vu_current_info -> 'isMilitaryRegistered' = 'true')
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null)
select t1.total_count, t2.male_count, t3.female_count, '00' as recruitment_id,
0 as mobilization_criterion, 0 as volunteer_criterion, 0 as contract_criterion, 0 as mobilization_criterion_percent, 0 as volunteer_criterion_percent, 0 as contract_criterion_percent
from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1</sql>

View file

@ -1229,7 +1229,7 @@
SELECT COUNT(*) AS total
FROM public.recruits r
join public.recruits_info ri on ri.recruit_id=r.id
WHERE r.vu_current_info->>'isMilitaryRegistered' = 'true'
WHERE r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
),
age_counts AS (
SELECT
@ -1243,7 +1243,7 @@ age_counts AS (
COUNT(*) FILTER (WHERE EXTRACT(YEAR FROM AGE(birth_date)) >= 51) AS "51+_year_count"
FROM public.recruits r
join public.recruits_info ri on ri.recruit_id=r.id
WHERE r.vu_current_info->>'isMilitaryRegistered' = 'true'
WHERE r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
)
SELECT
age_counts."17_year_count",
@ -1310,7 +1310,7 @@ FROM age_counts, total_count;</sql>
SELECT COUNT(*) AS total
FROM public.recruits r
join public.recruits_info ri on ri.recruit_id=r.id
WHERE r.gender = 'FEMALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true'
WHERE r.gender = 'FEMALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
),
age_counts AS (
SELECT
@ -1324,7 +1324,7 @@ age_counts AS (
COUNT(*) FILTER (WHERE EXTRACT(YEAR FROM AGE(birth_date)) >= 51) AS "51+_year_count"
FROM public.recruits r
join public.recruits_info ri on ri.recruit_id=r.id
WHERE r.gender = 'FEMALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true'
WHERE r.gender = 'FEMALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
)
SELECT
age_counts."17_year_count",
@ -1391,7 +1391,7 @@ FROM age_counts, total_count;</sql>
SELECT COUNT(*) AS total
FROM public.recruits r
join public.recruits_info ri on ri.recruit_id=r.id
WHERE r.gender = 'MALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true'
WHERE r.gender = 'MALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
),
age_counts AS (
SELECT
@ -1405,7 +1405,7 @@ age_counts AS (
COUNT(*) FILTER (WHERE EXTRACT(YEAR FROM AGE(birth_date)) >= 51) AS "51+_year_count"
FROM public.recruits r
join public.recruits_info ri on ri.recruit_id=r.id
WHERE r.gender = 'MALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true'
WHERE r.gender = 'MALE' AND r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
)
SELECT
age_counts."17_year_count",

File diff suppressed because it is too large Load diff

View file

@ -793,7 +793,7 @@
</output>
</remotesteps>
<GUI>
<xloc>960</xloc>
<xloc>992</xloc>
<yloc>240</yloc>
<draw>Y</draw>
</GUI>
@ -897,7 +897,7 @@
</output>
</remotesteps>
<GUI>
<xloc>976</xloc>
<xloc>992</xloc>
<yloc>336</yloc>
<draw>Y</draw>
</GUI>
@ -1001,7 +1001,7 @@
</output>
</remotesteps>
<GUI>
<xloc>1040</xloc>
<xloc>992</xloc>
<yloc>416</yloc>
<draw>Y</draw>
</GUI>
@ -1111,7 +1111,7 @@
JOIN public.recruits r ON ri.recruit_id = r.id
WHERE
jsonb_typeof(ri.info->'svedDeti'->'rebenok') = 'array'
AND r.vu_current_info->>'isMilitaryRegistered' = 'true'
AND r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
),
children_birth_dates AS (
SELECT
@ -1141,6 +1141,8 @@ final_counts AS (
public.recruits_info ri
LEFT JOIN
children_count cc ON ri.recruit_id = cc.recruit_id
JOIN public.recruits r ON ri.recruit_id = r.id
WHERE r.vu_current_info->>'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
GROUP BY
COALESCE(children_under_18, 0)
),
@ -1204,7 +1206,9 @@ FROM
WHERE
jsonb_typeof(ri.info->'svedDeti'->'rebenok') = 'array'
AND r.vu_current_info->>'isMilitaryRegistered' = 'true'
AND gender = 'FEMALE'
AND r.current_recruitment_id IS NOT NULL
AND r.target_recruitment_id IS NOT NULL
AND r.gender = 'FEMALE'
),
children_birth_dates AS (
SELECT
@ -1222,7 +1226,7 @@ children_count AS (
FROM
children_birth_dates
WHERE
AGE(make_date(year, month, day)) &lt; interval '18 years'
make_date(year, month, day) > CURRENT_DATE - INTERVAL '18 years'
GROUP BY
recruit_id
),
@ -1234,26 +1238,40 @@ final_counts AS (
public.recruits_info ri
LEFT JOIN
children_count cc ON ri.recruit_id = cc.recruit_id
JOIN public.recruits r ON ri.recruit_id = r.id
WHERE
r.vu_current_info->>'isMilitaryRegistered' = 'true'
AND r.current_recruitment_id IS NOT NULL
AND r.target_recruitment_id IS NOT NULL
AND r.gender = 'FEMALE'
GROUP BY
COALESCE(children_under_18, 0)
),
total_people AS (
SELECT SUM(num_people) AS total_count
FROM final_counts
total_men AS (
SELECT
COUNT(*) AS total_men_count
FROM
public.recruits_info ri
JOIN public.recruits r ON ri.recruit_id = r.id
WHERE
r.vu_current_info->>'isMilitaryRegistered' = 'true'
AND r.current_recruitment_id IS NOT NULL
AND r.target_recruitment_id IS NOT NULL
AND r.gender = 'FEMALE'
)
SELECT
'W' AS gender,
'00' as recruitment_id,
'W' AS gender,
'00' AS recruitment_id,
COALESCE(SUM(CASE WHEN children_count = 0 THEN num_people ELSE 0 END), 0) AS no_children,
COALESCE(SUM(CASE WHEN children_count = 1 THEN num_people ELSE 0 END), 0) AS one_child,
COALESCE(SUM(CASE WHEN children_count = 2 THEN num_people ELSE 0 END), 0) AS two_children,
COALESCE(SUM(CASE WHEN children_count = 3 THEN num_people ELSE 0 END), 0) AS three_children,
COALESCE(SUM(CASE WHEN children_count >= 4 THEN num_people ELSE 0 END), 0) AS four_or_more_children,
ROUND(COALESCE(SUM(CASE WHEN children_count = 0 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS no_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 1 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS one_child_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 2 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS two_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 3 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS three_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count >= 4 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS four_or_more_children_percent
ROUND(COALESCE(SUM(CASE WHEN children_count = 0 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS no_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 1 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS one_child_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 2 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS two_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 3 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS three_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count >= 4 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS four_or_more_children_percent
FROM
final_counts;</sql>
<limit>0</limit>
@ -1297,7 +1315,9 @@ FROM
WHERE
jsonb_typeof(ri.info->'svedDeti'->'rebenok') = 'array'
AND r.vu_current_info->>'isMilitaryRegistered' = 'true'
AND gender = 'MALE'
AND r.current_recruitment_id IS NOT NULL
AND r.target_recruitment_id IS NOT NULL
AND r.gender = 'MALE'
),
children_birth_dates AS (
SELECT
@ -1315,7 +1335,7 @@ children_count AS (
FROM
children_birth_dates
WHERE
AGE(make_date(year, month, day)) &lt; interval '18 years'
make_date(year, month, day) > CURRENT_DATE - INTERVAL '18 years'
GROUP BY
recruit_id
),
@ -1327,26 +1347,40 @@ final_counts AS (
public.recruits_info ri
LEFT JOIN
children_count cc ON ri.recruit_id = cc.recruit_id
JOIN public.recruits r ON ri.recruit_id = r.id
WHERE
r.vu_current_info->>'isMilitaryRegistered' = 'true'
AND r.current_recruitment_id IS NOT NULL
AND r.target_recruitment_id IS NOT NULL
AND r.gender = 'MALE'
GROUP BY
COALESCE(children_under_18, 0)
),
total_people AS (
SELECT SUM(num_people) AS total_count
FROM final_counts
total_men AS (
SELECT
COUNT(*) AS total_men_count
FROM
public.recruits_info ri
JOIN public.recruits r ON ri.recruit_id = r.id
WHERE
r.vu_current_info->>'isMilitaryRegistered' = 'true'
AND r.current_recruitment_id IS NOT NULL
AND r.target_recruitment_id IS NOT NULL
AND r.gender = 'MALE'
)
SELECT
'M' AS gender,
'00' as recruitment_id,
'M' AS gender,
'00' AS recruitment_id,
COALESCE(SUM(CASE WHEN children_count = 0 THEN num_people ELSE 0 END), 0) AS no_children,
COALESCE(SUM(CASE WHEN children_count = 1 THEN num_people ELSE 0 END), 0) AS one_child,
COALESCE(SUM(CASE WHEN children_count = 2 THEN num_people ELSE 0 END), 0) AS two_children,
COALESCE(SUM(CASE WHEN children_count = 3 THEN num_people ELSE 0 END), 0) AS three_children,
COALESCE(SUM(CASE WHEN children_count >= 4 THEN num_people ELSE 0 END), 0) AS four_or_more_children,
ROUND(COALESCE(SUM(CASE WHEN children_count = 0 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS no_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 1 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS one_child_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 2 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS two_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 3 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS three_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count >= 4 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_count FROM total_people), 0), 2) AS four_or_more_children_percent
ROUND(COALESCE(SUM(CASE WHEN children_count = 0 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS no_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 1 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS one_child_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 2 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS two_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count = 3 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS three_children_percent,
ROUND(COALESCE(SUM(CASE WHEN children_count >= 4 THEN num_people ELSE 0 END), 0) * 100.0 / NULLIF((SELECT total_men_count FROM total_men), 0), 2) AS four_or_more_children_percent
FROM
final_counts;</sql>
<limit>0</limit>

View file

@ -1128,7 +1128,7 @@
jsonb_path_exists(ri.info, '$.svedVoditUdost.voditUdost.svedKat[*]?(@.kategoriya like_regex "E")') AS has_E
FROM public.recruits_info ri
JOIN public.recruits r ON ri.recruit_id = r.id
where r.vu_current_info -> 'isMilitaryRegistered' = 'true'
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
),
aggregated AS (
SELECT
@ -1193,7 +1193,7 @@ FROM aggregated;</sql>
jsonb_path_exists(ri.info, '$.svedVoditUdost.voditUdost.svedKat[*]?(@.kategoriya like_regex "E")') AS has_E
FROM public.recruits_info ri
JOIN public.recruits r ON ri.recruit_id = r.id
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and gender = 'FEMALE'
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and gender = 'FEMALE' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
),
aggregated AS (
SELECT
@ -1258,7 +1258,7 @@ FROM aggregated;</sql>
jsonb_path_exists(ri.info, '$.svedVoditUdost.voditUdost.svedKat[*]?(@.kategoriya like_regex "E")') AS has_E
FROM public.recruits_info ri
JOIN public.recruits r ON ri.recruit_id = r.id
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and gender = 'MALE'
where r.vu_current_info -> 'isMilitaryRegistered' = 'true' and gender = 'MALE' and r.current_recruitment_id is not null and r.target_recruitment_id is not null
),
aggregated AS (
SELECT

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -983,7 +983,7 @@ from t1 full outer join t2 on 1 = 1
<connection>postgres.person_registry</connection>
<sql>select count(*) as removed_registry, 1 org
from recruits r
where r.system_pgs_status = '1.3'</sql>
where r.system_pgs_status = '1.3' and r.current_recruitment_id is not null and r.target_recruitment_id is not null</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>