micord/ervu-dashboard-etl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ratings

Browse source
This commit is contained in:
Ruslan 2025-03-18 12:39:43 +03:00
parent ecb52f53a5
commit 83de694301
7 changed files with 179 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
v1_apache-hop dash mapping/mil_com/recruitment_campaign.subpoenas(m_c).hpl
View file

@ -282,7 +282,11 @@
<connection>postgres.subpoena</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>subpoena_data AS (
<sql>WITH
ids AS (
SELECT unnest(string_to_array(trim(both '{}' from '${ARR_MC}'), ','))::uuid AS recruitment_id
),
subpoena_data AS (
SELECT
s.id AS subpoena_id,
s.create_date,

8
v1_apache-hop dash mapping/mil_com/total_registered.reg_mil_cat(m_c).hpl
View file

@ -306,8 +306,8 @@ base_data AS (
'2', -- Приобретение гражданства Российской Федерации
'3', -- Получение военно-учётной специальности гражданином женского пола
'4', -- Отбывание наказания в местах лишения свободы
'5', -- Достижение 17 лет в год постановки на воинский учёт
'6' -- Первоначальная постановка на воинский учет граждан, не состоящих, но обязанных состоять на воинском учёте
'5'--, -- Достижение 17 лет в год постановки на воинский учёт
--'6' -- Первоначальная постановка на воинский учет граждан, не состоящих, но обязанных состоять на воинском учёте
])
UNION ALL
SELECT
@ -323,7 +323,7 @@ base_data AS (
rh.id in (SELECT recruit_history_id FROM notregistered)
and coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids)
AND r.current_recruitment_id is null
AND jsonb_exists_any(registration_reasons, ARRAY['1', '2', '3', '4', '5', '6'])
AND jsonb_exists_any(registration_reasons, ARRAY['1', '2', '3', '4', '5'])
),
t1 AS (
-- Первоначальная постановка 17 лет
@ -342,7 +342,7 @@ t2 AS (
is_military_registered,
COUNT(*) AS first_reg_18
FROM base_data
WHERE jsonb_exists_any(registration_reasons, ARRAY['1', '2', '3', '4', '6'])
WHERE jsonb_exists_any(registration_reasons, ARRAY['1', '2', '3', '4'])
GROUP BY recruitment_id, is_military_registered
),
t3 AS (

2
v1_apache-hop dash mapping/ratings/job_ratings.hwf
View file

@ -291,7 +291,7 @@
<hop>
<from>rows_id-array_reg.hpl</from>
<to>SQL ratings.conscription_info</to>
<enabled>N</enabled>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>

50
v1_apache-hop dash mapping/ratings/ratings.appear_subpoena.hpl
View file

@ -158,13 +158,22 @@
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>WITH
total AS (
subpoena_data AS (
SELECT
ss.code,
s.department_id
s.id AS subpoena_id,
s.create_date,
s.department_id AS recruitment_id,
s.status_id,
sr.type,
ssh.code AS sub_stat_hist,
s.send_date,
sh.date_time::timestamp AS history_date,
ROW_NUMBER() OVER (PARTITION BY s.id ORDER BY sh.date_time DESC) AS rn
FROM public.subpoena s
JOIN subpoena_status ss
ON s.status_id = ss.id
JOIN subpoena_status ss ON s.status_id = ss.id
JOIN subpoena_reason AS sr ON sr.id = s.reason_id
JOIN subpoena_history AS sh ON sh.subpoena_id = s.id
JOIN subpoena_status AS ssh ON ssh.id = sh.status_id
WHERE ('${VK_ARRAY}' IS NULL
OR '${VK_ARRAY}' = ''
OR s.department_id = ANY (
@ -173,14 +182,39 @@ total AS (
)::uuid[]
)
)
AND sr.type IS NOT NULL
AND ssh.code NOT IN ('3.7','3.72', '3.71')
AND EXISTS (
SELECT 1
FROM subpoena_history sh2
WHERE sh2.subpoena_id = s.id
AND sh2.status_id = (SELECT id FROM subpoena_status WHERE code = '3')
)
),
last_status AS (
SELECT *
FROM subpoena_data
WHERE rn = 1
),
season_separations AS (
SELECT distinct
ls.recruitment_id,
ls.create_date,
ls.sub_stat_hist,
ls.subpoena_id,
ls.history_date
FROM last_status ls
WHERE ls.create_date >= DATE_TRUNC('year', CURRENT_DATE)
)
SELECT
'${REG_ID}' AS region_id,
COUNT(*) FILTER (WHERE tt.code IN ('4.1', '4.2')) AS appear_mil_com,
COUNT(*) FILTER (WHERE tt.sub_stat_hist IN ('4.1', '4.2')) AS appear_mil_com,
ROUND(
COUNT(*) FILTER (WHERE tt.code IN ('4.1', '4.2'))::NUMERIC / NULLIF(COUNT(*), 0) * 100, 2
COUNT(*) FILTER (WHERE tt.sub_stat_hist IN ('4.1', '4.2'))::NUMERIC / NULLIF(COUNT(*), 0) * 100, 2
) AS appear_mil_com_percent
FROM total tt;</sql>
FROM season_separations tt
HAVING COUNT(*) FILTER (WHERE tt.sub_stat_hist IN ('4.1', '4.2')) > 0;
</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>

17
v1_apache-hop dash mapping/ratings/ratings.conscription_info.hpl
View file

@ -80,11 +80,13 @@
<condition>=</condition>
<field>id_region</field>
<name>REG_ID</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>spring_autumn</field>
<name>spring_autumn</name>
<name2/>
</key>
<schema>ratings</schema>
<table>conscription_info</table>
@ -168,7 +170,7 @@
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>WITH
total AS (
subpoena_data AS (
SELECT
s.id AS subpoena_id,
s.create_date,
@ -178,7 +180,7 @@ total AS (
ssh.code AS sub_stat_hist,
s.send_date,
sh.date_time::timestamp AS history_date,
ROW_NUMBER() OVER (PARTITION BY s.id ORDER BY sh.date_time DESC) AS rn
ROW_NUMBER() OVER (PARTITION BY s.id ORDER BY sh.date_time DESC) AS rn
FROM public.subpoena s
JOIN subpoena_status ss ON s.status_id = ss.id
JOIN subpoena_reason AS sr ON sr.id = s.reason_id
@ -219,17 +221,16 @@ season_separations AS (
END AS spring_autumn
FROM last_status ls
WHERE ls.create_date >= DATE_TRUNC('year', CURRENT_DATE)
),
season_separations_clean AS (
SELECT DISTINCT recruitment_id, spring_autumn FROM season_separations
)
SELECT
'${REG_ID}' AS region_id,
COUNT(*) FILTER (WHERE tt.code IN ('5')) AS appear_mil_com,
tt.spring_autumn,
COUNT(*) FILTER (WHERE tt.sub_stat_hist IN ('5')) AS appear_mil_com,
ROUND(
COUNT(*) FILTER (WHERE tt.code IN ('5'))::NUMERIC / NULLIF(COUNT(*), 0) * 100, 2
COUNT(*) FILTER (WHERE tt.sub_stat_hist IN ('5'))::NUMERIC / NULLIF(COUNT(*), 0) * 100, 2
) AS appear_mil_com_percent
FROM total tt;</sql>
FROM season_separations tt
group by tt.spring_autumn</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>

38
v1_apache-hop dash mapping/recording_date/job_last_recording_date.hwf
View file

@ -63,7 +63,7 @@
<wait_until_finished>Y</wait_until_finished>
<parallel>N</parallel>
<xloc>496</xloc>
<yloc>368</yloc>
<yloc>240</yloc>
<attributes_hac/>
</action>
<action>
@ -78,6 +78,24 @@ set entry = '1',
start_time = now()
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>N</parallel>
<xloc>432</xloc>
<yloc>64</yloc>
<attributes_hac/>
</action>
<action>
<name>SQL.delete 2</name>
<description/>
<type>SQL</type>
<attributes/>
<connection>ervu-dashboard</connection>
<sendOneStatement>N</sendOneStatement>
<sql>delete from public.last_recording_date
</sql>
<sqlfilename/>
<sqlfromfile>N</sqlfromfile>
@ -92,7 +110,7 @@ start_time = now()
<hop>
<from>Start</from>
<to>SQL.delete</to>
<enabled>Y</enabled>
<enabled>N</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
@ -106,13 +124,27 @@ start_time = now()
<hop>
<from>last_recording_date</from>
<to>Success</to>
<enabled>N</enabled>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>SQL.delete</from>
<to>Success</to>
<enabled>N</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Start</from>
<to>SQL.delete 2</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL.delete 2</from>
<to>last_recording_date</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>

83
v1_apache-hop dash mapping/supportive_jobs/clearing_logs.hwf Normal file
View file

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<workflow>
<name>clearing_logs</name>
<name_sync_with_filename>Y</name_sync_with_filename>
<description/>
<extended_description/>
<workflow_version/>
<created_user>-</created_user>
<created_date>2025/03/18 11:52:48.920</created_date>
<modified_user>-</modified_user>
<modified_date>2025/03/18 11:52:48.920</modified_date>
<parameters>
</parameters>
<actions>
<action>
<name>Start</name>
<description/>
<type>SPECIAL</type>
<attributes/>
<DayOfMonth>1</DayOfMonth>
<hour>12</hour>
<intervalMinutes>60</intervalMinutes>
<intervalSeconds>0</intervalSeconds>
<minutes>0</minutes>
<repeat>N</repeat>
<schedulerType>0</schedulerType>
<weekDay>1</weekDay>
<parallel>N</parallel>
<xloc>512</xloc>
<yloc>320</yloc>
<attributes_hac/>
</action>
<action>
<name>SQL, зачистка таблиц логов workflow_logs, channel_log</name>
<description/>
<type>SQL</type>
<attributes/>
<connection>ervu-dashboard</connection>
<sendOneStatement>N</sendOneStatement>
<sql>DELETE FROM public.channel_log
WHERE log_date &lt; DATE_TRUNC('day', CURRENT_DATE) - INTERVAL '4 days';
DELETE FROM public.workflow_logs
WHERE workflowstart &lt; DATE_TRUNC('day', CURRENT_DATE) - INTERVAL '4 days';</sql>
<sqlfilename/>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>N</parallel>
<xloc>816</xloc>
<yloc>320</yloc>
<attributes_hac/>
</action>
<action>
<name>Success</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<xloc>1184</xloc>
<yloc>320</yloc>
<attributes_hac/>
</action>
</actions>
<hops>
<hop>
<from>Start</from>
<to>SQL, зачистка таблиц логов workflow_logs, channel_log</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>SQL, зачистка таблиц логов workflow_logs, channel_log</from>
<to>Success</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
</hops>
<notepads>
</notepads>
<attributes/>
</workflow>