From 289229d4a2cdc003597bfd154f97bdfce2124d7c Mon Sep 17 00:00:00 2001 From: Antony Le Courtes <antony.lecourtes@unicaen.fr> Date: Mon, 11 Oct 2021 16:43:15 +0200 Subject: [PATCH] Affinage de la MV_INTERVENANT pour certains cas 'Autres' --- doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql b/doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql index 867c04bc09..2ce013bd3a 100644 --- a/doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql +++ b/doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql @@ -1,6 +1,6 @@ CREATE MATERIALIZED VIEW MV_INTERVENANT AS - WITH i AS ( +WITH i AS ( SELECT DISTINCT code, MAX(z_statut_id) OVER (partition by code, z_statut_id) z_statut_id, @@ -18,7 +18,7 @@ MATERIALIZED VIEW MV_INTERVENANT AS WHEN icto.code_ose IS NOT NULL THEN icto.code_ose ELSE 'AUTRES' END z_statut_id, CASE - WHEN icto.code_ose IS NOT NULL AND icto.code_ose NOT IN ('BIATSS','NON_AUTORISE') THEN 'permanent' + WHEN icto.code_ose IS NOT NULL AND icto.code_ose NOT IN ('NON_AUTORISE') THEN 'permanent' ELSE 'vacataire' END z_type, icto.id_orig source_code, COALESCE(icto.d_debut, to_date('01/01/1900', 'dd/mm/YYYY')) validite_debut, @@ -52,7 +52,7 @@ MATERIALIZED VIEW MV_INTERVENANT AS FROM octo.individu_unique@octoprod uni JOIN octo.individu_statut@octoprod inds ON inds.individu_id = uni.c_individu_chaine LEFT JOIN octo.v_individu_statut@octoprod vinds ON vinds.individu_id = uni.c_individu_chaine - LEFT JOIN octo.v_individu_contrat_type_ose@octoprod icto ON uni.c_individu_chaine = icto.individu_id AND (icto.d_debut - 184 <= SYSDATE OR icto.d_fin >= SYSDATE) AND icto.code_ose IS NOT NULL AND icto.code_ose != 'NON_AUTORISE' + LEFT JOIN octo.v_individu_contrat_type_ose@octoprod icto ON uni.c_individu_chaine = icto.individu_id AND icto.d_debut - 184 <= SYSDATE AND icto.d_fin >= SYSDATE AND icto.code_ose IS NOT NULL AND icto.code_ose NOT IN('NON_AUTORISE') WHERE inds.d_debut - 184 <= SYSDATE --On ne remonte pas de statut autre pour ceux qui ont déjà un certain type de contrat --AND icto.individu_id IS NULL -- GitLab