This commit is contained in:
Ruslan 2024-09-09 16:19:56 +03:00
parent 61923855cf
commit e974b0b3b6
11 changed files with 138 additions and 32 deletions

View file

@ -648,6 +648,11 @@
<rename>not_work_percent</rename>
<update>Y</update>
</value>
<value>
<name>busyness</name>
<rename>total_people</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -743,6 +748,11 @@
<rename>not_work_percent</rename>
<update>Y</update>
</value>
<value>
<name>busyness</name>
<rename>total_people</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -838,6 +848,11 @@
<rename>not_work_percent</rename>
<update>Y</update>
</value>
<value>
<name>busyness</name>
<rename>total_people</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>

View file

@ -647,6 +647,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>education_level</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -741,6 +746,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>education_level</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -835,6 +845,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>education_level</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -933,6 +948,7 @@ SELECT
average_prof,
only_general,
count_nodata,
total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@ -1038,6 +1054,7 @@ SELECT
average_prof,
only_general,
count_nodata,
total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@ -1143,6 +1160,7 @@ SELECT
average_prof,
only_general,
count_nodata,
total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,

View file

@ -501,7 +501,7 @@
</attributes>
</connection>
<connection>
<name>postgres.person_registry</name>
<name>ervu_person_registry</name>
<server>person-dbhost</server>
<type>POSTGRESQL</type>
<access>Native</access>
@ -627,6 +627,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>marital_status</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -701,6 +706,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>marital_status</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -775,6 +785,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>marital_status</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -801,7 +816,7 @@
<method>none</method>
<schema_name/>
</partitioning>
<connection>postgres.person_registry</connection>
<connection>ervu_person_registry</connection>
<sql>SELECT
COUNT(*) FILTER (
WHERE
@ -874,7 +889,7 @@ WHERE
<method>none</method>
<schema_name/>
</partitioning>
<connection>postgres.person_registry</connection>
<connection>ervu_person_registry</connection>
<sql> SELECT
COUNT(*) FILTER (
WHERE
@ -949,7 +964,7 @@ WHERE
<method>none</method>
<schema_name/>
</partitioning>
<connection>postgres.person_registry</connection>
<connection>ervu_person_registry</connection>
<sql>SELECT
COUNT(*) FILTER (
WHERE

View file

@ -557,7 +557,7 @@
</partitioning>
<connection>ervu_person_registry</connection>
<sql>SELECT
full_name,
full_name as fio,
last_name,
first_name,
middle_name,
@ -575,7 +575,7 @@ CASE WHEN (EXISTS (
AND education->>'kodUrObr' IN ('1', '2', '3', '4', '5'))
OR EXISTS (
SELECT 1
FROM jsonb_array_elements(ri.info->'svedInObr'->'inObr') AS education
FROM jsonb_array_elements(ri.info-&gt;'svedInObr'->'inObr') AS education
WHERE jsonb_typeof(ri.info->'svedInObr'->'inObr') = 'array'
AND education->>'kodUrObr' IN ('1', '2', '3', '4', '5')
)) THEN 'Высшее'
@ -621,7 +621,8 @@ ri.info->'svedSemPolozh'->>'semPolozhNaim' marital_status,
ri.info->'pasportRF'->'aktPasportRF'->>'nomDok' passport_number,
ri.info->'pasportRF'->'aktPasportRF'->>'serDok' passport_series,
ri.info->'svedVoin'->'voin'->>'dataReg' issue_date,
ri.recruit_id as citizen_id
ri.recruit_id as citizen_id,
r.target_recruitment_id as recruitment_id
FROM public.recruits_info ri
JOIN public.recruits r ON ri.recruit_id = r.id</sql>
<limit>0</limit>
@ -655,7 +656,7 @@ JOIN public.recruits r ON ri.recruit_id = r.id</sql>
<schema_name/>
</partitioning>
<connection>ervu-dashboard</connection>
<schema>ervu_dashboard</schema>
<schema>public</schema>
<table>citizen</table>
<commit>1000</commit>
<truncate>N</truncate>
@ -682,7 +683,7 @@ JOIN public.recruits r ON ri.recruit_id = r.id</sql>
</output>
</remotesteps>
<GUI>
<xloc>480</xloc>
<xloc>464</xloc>
<yloc>208</yloc>
<draw>Y</draw>
</GUI>

View file

@ -415,7 +415,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>delete from ervu_dashboard.citizen</sql>
<sql>delete from public.citizen</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>

View file

@ -561,7 +561,7 @@ rt2.id, rt2.shortname, rt2.parent_id, rt2.idm_id, r.code
from region r
left join recruitment rt on rt.region_id=r.idm_id::text
left join recruitment rt2 on rt2.parent_id=rt.idm_id::text
where r.code in ('48', '62','65') and rt2.idm_id is not null
where r.code in ('12', '62','65') and rt2.idm_id is not null
</sql>
<limit>0</limit>
<lookup/>

View file

@ -893,7 +893,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM main_dashboard.appeals where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM main_dashboard.appeals where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -911,7 +911,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM main_dashboard.recruitment_campaign where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM main_dashboard.recruitment_campaign where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -929,7 +929,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM main_dashboard.total_registered where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM main_dashboard.total_registered where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -947,7 +947,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM main_dashboard.waiting_registration where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM main_dashboard.waiting_registration where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -965,7 +965,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM recruitment_campaign.subpoenas where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM recruitment_campaign.subpoenas where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -983,7 +983,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.reg_mil_cat where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.reg_mil_cat where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1001,7 +1001,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.removed_registry where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.removed_registry where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1019,7 +1019,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.subpoenas where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.subpoenas where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1097,7 +1097,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.driver_license where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.driver_license where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1175,7 +1175,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.child_minor where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.child_minor where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1253,7 +1253,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.age where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.age where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1331,7 +1331,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.marital_status where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.marital_status where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1409,7 +1409,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.education_level where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.education_level where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>
@ -1487,7 +1487,7 @@
<description/>
<type>SQL</type>
<attributes/>
<sql>DELETE FROM total_registered.busyness where recruitment_id in ('48', '62', '65') and recording_date = current_date</sql>
<sql>DELETE FROM total_registered.busyness where recruitment_id in ('12', '62', '65') and recording_date = current_date</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
<sqlfilename/>

View file

@ -531,15 +531,24 @@
<schema_name/>
</partitioning>
<connection>ervu-dashboard</connection>
<sql>with
t1 as (SELECT ARRAY_AGG(t.idm_id) as RECRUITMENT48_ID FROM space.testrecruitment AS t where t.code = '48'),
t2 as (SELECT ARRAY_AGG(t.idm_id) as RECRUITMENT62_ID FROM space.testrecruitment AS t where t.code = '62'),
t3 as (SELECT ARRAY_AGG(t.idm_id) as RECRUITMENT65_ID FROM space.testrecruitment AS t where t.code = '65')
SELECT t1.RECRUITMENT48_ID AS VK_ARRAY_ID, '48' as RECRUITMENT_REG_ID FROM t1
<sql>WITH
t1 AS (SELECT ARRAY_AGG(t.idm_id) AS RECRUITMENT48_ID FROM space.testrecruitment AS t WHERE t.code = '12'),
t2 AS (SELECT ARRAY_AGG(t.idm_id) AS RECRUITMENT62_ID FROM space.testrecruitment AS t WHERE t.code = '62'),
t3 AS (SELECT ARRAY_AGG(t.idm_id) AS RECRUITMENT65_ID FROM space.testrecruitment AS t WHERE t.code = '65')
SELECT
COALESCE(t1.RECRUITMENT48_ID, ARRAY['00']) AS VK_ARRAY_ID,
'12' AS RECRUITMENT_REG_ID
FROM t1
UNION ALL
SELECT t2.RECRUITMENT62_ID, '62' FROM t2
SELECT
COALESCE(t2.RECRUITMENT62_ID, ARRAY['00']),
'62'
FROM t2
UNION ALL
SELECT t3.RECRUITMENT65_ID, '65' FROM t3</sql>
SELECT
COALESCE(t3.RECRUITMENT65_ID, ARRAY['00']),
'65'
FROM t3;</sql>
<limit>10</limit>
<lookup/>
<execute_each_row>N</execute_each_row>

View file

@ -819,6 +819,11 @@
<rename>not_work_percent</rename>
<update>Y</update>
</value>
<value>
<name>busyness</name>
<rename>total_people</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -902,6 +907,11 @@
<rename>not_work_percent</rename>
<update>Y</update>
</value>
<value>
<name>busyness</name>
<rename>total_people</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -985,6 +995,11 @@
<rename>not_work_percent</rename>
<update>Y</update>
</value>
<value>
<name>busyness</name>
<rename>total_people</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>

View file

@ -824,6 +824,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>education_level</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -912,6 +917,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>education_level</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -1000,6 +1010,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>education_level</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -1284,6 +1299,7 @@ SELECT
average_prof,
only_general,
count_nodata,
total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@ -1389,6 +1405,7 @@ SELECT
average_prof,
only_general,
count_nodata,
total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@ -1494,6 +1511,7 @@ SELECT
average_prof,
only_general,
count_nodata,
total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,

View file

@ -804,6 +804,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>marital_status</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -872,6 +877,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>marital_status</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -940,6 +950,11 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>marital_status</name>
<rename>total</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>