From 98bc56755597ae3c9ff6f29d9eaab8080c20f40f Mon Sep 17 00:00:00 2001
From: Ruslan <r.gaztdinov@micord.ru>
Date: Tue, 8 Apr 2025 12:50:02 +0300
Subject: [PATCH] -postponement_have_right

---
 .../main_dashboard.recruitment_campaign(m_c).hwf     |  4 ++--
 .../m_d.rec_cam(m_c)_to_decision_service.hpl         | 12 ++++++------
 .../m_d.rec_cam(m_c)_to_decision_service_uniq.hpl    | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c).hwf b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c).hwf
index 25924ce..f42b79b 100644
--- a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c).hwf	
+++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c).hwf	
@@ -304,7 +304,7 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>1808</xloc>
+      <xloc>1984</xloc>
       <yloc>368</yloc>
       <attributes_hac/>
     </action>
@@ -344,7 +344,7 @@
       <type>SUCCESS</type>
       <attributes/>
       <parallel>N</parallel>
-      <xloc>2064</xloc>
+      <xloc>2240</xloc>
       <yloc>368</yloc>
       <attributes_hac/>
     </action>
diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl
index 965c3c7..c0afd4c 100644
--- a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl	
+++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl	
@@ -58,7 +58,7 @@ vse AS(
         ROW_NUMBER() OVER (PARTITION BY dd.recruit_id ORDER BY COALESCE(dd.updated_at, dd.created_at) DESC) AS rn
     FROM recruit r
     JOIN deferment_decision dd ON dd.recruit_id = r.id
-    JOIN deferment_decision_type ddt on ddt.id = dd.type_id AND ddt.code = '1'
+    JOIN deferment_decision_type ddt on ddt.id = dd.type_id AND ddt.code in ('1', '2')
     WHERE COALESCE(r.current_recruitment, r.target_recruitment)::uuid IN (SELECT recruitment_id FROM ids)
 ),
 last_status AS(
@@ -67,7 +67,7 @@ last_status AS(
     WHERE rn = 1
 )
 SELECT
-    COALESCE(COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'true'), 0) AS postponement_have_right,
+    --COALESCE(COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'true'), 0) AS postponement_have_right,
     COALESCE(COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'false'), 0) AS postponement_granted,
     --COALESCE((COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'true') * 100 / NULLIF(COUNT(ls.postponement), 0)), 0) AS postponement_have_right_percent,
     --COALESCE((COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'false') * 100 / NULLIF(COUNT(ls.postponement), 0)), 0) AS postponement_granted_percent,
@@ -104,28 +104,28 @@ GROUP BY spring_autumn, ls.recruitment_id</sql>
     <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>main_dashboard</schema>
       <table>recruitment_campaign</table>
-      <value>
-        <name>postponement_have_right</name>
-        <rename>postponement_have_right</rename>
-      </value>
       <value>
         <name>postponement_granted</name>
         <rename>postponement_granted</rename>
diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service_uniq.hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service_uniq.hpl
index 522ade4..8a4475b 100644
--- a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service_uniq.hpl	
+++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service_uniq.hpl	
@@ -92,7 +92,7 @@ last_status AS(
     WHERE rn = 1
 )
 SELECT
-    COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'true') AS postponement_have_right,
+    --COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'true') AS postponement_have_right,
     COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'false') AS postponement_granted,
     'Весна' AS spring_autumn,
     ls.recruitment_id,
@@ -106,7 +106,7 @@ GROUP BY ls.recruitment_id
 UNION ALL 
 
 SELECT
-    COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'true') AS postponement_have_right,
+    --COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'true') AS postponement_have_right,
     COUNT(ls.postponement) FILTER (WHERE ls.postponement = 'false') AS postponement_granted,
     'Осень' AS spring_autumn,
     ls.recruitment_id,
@@ -137,28 +137,28 @@ GROUP BY ls.recruitment_id;</sql>
     <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>main_dashboard</schema>
       <table>recruitment_campaign</table>
-      <value>
-        <name>postponement_have_right</name>
-        <rename>postponement_have_right</rename>
-      </value>
       <value>
         <name>postponement_granted</name>
         <rename>postponement_granted</rename>