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

fix

Browse source
This commit is contained in:
Ruslan 2025-03-30 18:34:42 +03:00
parent f38eda3649
commit 0dde5613bf
8 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

36
v1_apache-hop dash mapping/mil_com/job_recruitments_milcom.hwf
View file

@ -667,7 +667,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1120</yloc>
<attributes_hac/>
@ -702,7 +702,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>960</yloc>
<attributes_hac/>
@ -720,7 +720,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1040</yloc>
<attributes_hac/>
@ -737,7 +737,7 @@ WHERE recording_date = current_date
AND schema IN ('Department', 'MD_LVL', 'REG_LVL', 'empty', 'Organization', 'Region')</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1200</yloc>
<attributes_hac/>
@ -755,7 +755,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1280</yloc>
<attributes_hac/>
@ -772,7 +772,7 @@ WHERE recording_date = current_date
AND schema IN ('Department', 'MD_LVL', 'REG_LVL', 'empty', 'Organization', 'Region')</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1360</yloc>
<attributes_hac/>
@ -790,7 +790,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1440</yloc>
<attributes_hac/>
@ -808,7 +808,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1520</yloc>
<attributes_hac/>
@ -826,7 +826,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1600</yloc>
<attributes_hac/>
@ -843,7 +843,7 @@ WHERE recording_date = current_date
AND schema IN ('Department', 'MD_LVL', 'REG_LVL', 'empty', 'Organization', 'Region')</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1680</yloc>
<attributes_hac/>
@ -861,7 +861,7 @@ WHERE recording_date = current_date
</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1760</yloc>
<attributes_hac/>
@ -878,7 +878,7 @@ WHERE recording_date = current_date
AND schema IN ('Department', 'MD_LVL', 'REG_LVL', 'empty', 'Organization', 'Region')</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>1840</yloc>
<attributes_hac/>
@ -902,7 +902,7 @@ WHERE recording_date = current_date
<set_append_logfile>N</set_append_logfile>
<set_logfile>N</set_logfile>
<wait_until_finished>Y</wait_until_finished>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>880</yloc>
<attributes_hac/>
@ -973,7 +973,7 @@ AND postponement_granted IS NULL;</sql>
<set_append_logfile>N</set_append_logfile>
<set_logfile>N</set_logfile>
<wait_until_finished>Y</wait_until_finished>
<parallel>Y</parallel>
<parallel>N</parallel>
<xloc>928</xloc>
<yloc>800</yloc>
<attributes_hac/>
@ -1306,8 +1306,8 @@ AND postponement_granted IS NULL;</sql>
<from>main_dashboard.recruitment_campaign(m_c).hwf</from>
<to>postponement_percents.hpl</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
<evaluation>N</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>postponement_percents.hpl</from>
@ -1327,8 +1327,8 @@ AND postponement_granted IS NULL;</sql>
<from>recruitment_campaign.subpoenas(m_c).hwf</from>
<to>Success 6</to>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
<evaluation>N</evaluation>
<unconditional>Y</unconditional>
</hop>
</hops>
<notepads>

2
v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c).hwf
View file

@ -400,7 +400,7 @@ WHERE recording_date = current_date
AND schema IN ('Department', 'MD_LVL', 'REG_LVL', 'empty', 'Organization', 'Region')</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>N</parallel>
<parallel>Y</parallel>
<xloc>256</xloc>
<yloc>256</yloc>
<attributes_hac/>

3
v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/recruitment_season_combination.hpl
View file

@ -44,16 +44,19 @@
<condition>=</condition>
<field>recruitment_id</field>
<name>recruitment_id</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>recording_date</field>
<name>recording_date</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>spring_autumn</field>
<name>spring_autumn</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>recruitment_campaign</table>

3
v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/recruitment_season_combination_uniq.hpl
View file

@ -44,16 +44,19 @@
<condition>=</condition>
<field>recruitment_id</field>
<name>recruitment_id</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>recording_date</field>
<name>recording_date</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>spring_autumn</field>
<name>spring_autumn</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>recruitment_campaign</table>

10
v1_apache-hop dash mapping/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_campaign.subpoenas(m_c).hwf
View file

@ -42,7 +42,7 @@ WHERE recording_date = current_date
AND schema IN ('Department', 'MD_LVL', 'REG_LVL', 'empty', 'Organization', 'Region')</sql>
<sqlfromfile>N</sqlfromfile>
<useVariableSubstitution>N</useVariableSubstitution>
<parallel>N</parallel>
<parallel>Y</parallel>
<xloc>624</xloc>
<yloc>304</yloc>
<attributes_hac/>
@ -110,16 +110,20 @@ WHERE recording_date = current_date
<clear_rows>N</clear_rows>
<create_parent_folder>N</create_parent_folder>
<exec_per_row>Y</exec_per_row>
<filename>${PROJECT_HOME}/mil_com/main_dashboard.recruitment_campaign(m_c)/recruitment_season_combination_uniq.hpl</filename>
<filename>${PROJECT_HOME}/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_season_combination_uniq.hpl</filename>
<logext/>
<logfile/>
<loglevel>Basic</loglevel>
<parameters>
<parameter>
<name>ARR_MC_SP</name>
<stream_name>ARRAY_MIL_COM_SP</stream_name>
<value/>
</parameter>
<parameter>
<name>ARR_MC_AU</name>
<stream_name>ARRAY_MIL_COM_AU</stream_name>
<value/>
</parameter>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
@ -144,7 +148,7 @@ WHERE recording_date = current_date
<clear_rows>N</clear_rows>
<create_parent_folder>N</create_parent_folder>
<exec_per_row>Y</exec_per_row>
<filename>${PROJECT_HOME}/mil_com/main_dashboard.recruitment_campaign(m_c)/recruitment_season_combination.hpl</filename>
<filename>${PROJECT_HOME}/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_season_combination.hpl</filename>
<loglevel>Basic</loglevel>
<parameters>
<parameter>

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

@ -434,7 +434,7 @@ season_separations AS (
ls.d_code,
ls.act_number,
ls.rdi_id,
ls.season AS spring_autumn
'Весна' AS spring_autumn
FROM subpoena_data ls
WHERE (ls.visit_date BETWEEN DATE_TRUNC('year', ls.visit_date) + INTERVAL '4 months' + INTERVAL '1 day'
AND DATE_TRUNC('year', ls.visit_date) + INTERVAL '7 months' + INTERVAL '14 days')
@ -455,7 +455,7 @@ season_separations AS (
ls.d_code,
ls.act_number,
ls.rdi_id,
ls.season AS spring_autumn
'Осень' AS spring_autumn
FROM subpoena_data ls
WHERE (ls.visit_date BETWEEN DATE_TRUNC('year', ls.visit_date) + INTERVAL '10 months' + INTERVAL '1 day'
AND DATE_TRUNC('year', ls.visit_date) + INTERVAL '12 months' + INTERVAL '30 days')
@ -658,25 +658,21 @@ LEFT JOIN t13 ON ss.recruitment_id = t13.recruitment_id AND ss.spring_autumn = t
<commit>100</commit>
<connection>ervu-dashboard</connection>
<error_ignored>Y</error_ignored>
<ignore_flag_field/>
<lookup>
<key>
<condition>=</condition>
<field>recruitment_id</field>
<name>recruitment_id</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>spring_autumn</field>
<name>spring_autumn</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>recording_date</field>
<name>recording_date</name>
<name2/>
</key>
<schema>recruitment_campaign</schema>
<table>subpoenas</table>

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

@ -22,12 +22,12 @@
<order>
<hop>
<from>Table input (person_registry) регион/осень</from>
<to>Insert / update (main_dashboard.recruitment_campaign)</to>
<to>Insert / update (recruitment_campaign.subpoenas)</to>
<enabled>Y</enabled>
</hop>
</order>
<transform>
<name>Insert / update (main_dashboard.recruitment_campaign)</name>
<name>Insert / update (recruitment_campaign.subpoenas)</name>
<type>InsertUpdate</type>
<description/>
<distribute>Y</distribute>
@ -44,19 +44,22 @@
<condition>=</condition>
<field>recruitment_id</field>
<name>recruitment_id</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>recording_date</field>
<name>recording_date</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>spring_autumn</field>
<name>spring_autumn</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>recruitment_campaign</table>
<schema>recruitment_campaign</schema>
<table>subpoenas</table>
<value>
<name>recruitment_id</name>
<rename>recruitment_id</rename>

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

@ -22,12 +22,12 @@
<order>
<hop>
<from>Table input (person_registry) регион/осень</from>
<to>Insert / update (main_dashboard.recruitment_campaign)</to>
<to>Insert / update (recruitment_campaign.subpoenas)</to>
<enabled>Y</enabled>
</hop>
</order>
<transform>
<name>Insert / update (main_dashboard.recruitment_campaign)</name>
<name>Insert / update (recruitment_campaign.subpoenas)</name>
<type>InsertUpdate</type>
<description/>
<distribute>Y</distribute>
@ -44,19 +44,22 @@
<condition>=</condition>
<field>recruitment_id</field>
<name>recruitment_id</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>recording_date</field>
<name>recording_date</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>spring_autumn</field>
<name>spring_autumn</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>recruitment_campaign</table>
<schema>recruitment_campaign</schema>
<table>subpoenas</table>
<value>
<name>recruitment_id</name>
<rename>recruitment_id</rename>