From 05a8109f6b445200167bf038f1fc4e66e2fde750 Mon Sep 17 00:00:00 2001 From: Antony Le Courtes <antony.lecourtes@unicaen.fr> Date: Tue, 18 Feb 2025 11:02:13 +0100 Subject: [PATCH] Corrections mineures vues sql --- data/ddl/view/V_EXPORT_PAIEMENT_INDEMNITES_SIHAM.sql | 7 +++++-- data/ddl/view/V_EXPORT_SERVICE.sql | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/ddl/view/V_EXPORT_PAIEMENT_INDEMNITES_SIHAM.sql b/data/ddl/view/V_EXPORT_PAIEMENT_INDEMNITES_SIHAM.sql index b21429b481..0d0ff9c7ac 100644 --- a/data/ddl/view/V_EXPORT_PAIEMENT_INDEMNITES_SIHAM.sql +++ b/data/ddl/view/V_EXPORT_PAIEMENT_INDEMNITES_SIHAM.sql @@ -36,7 +36,8 @@ SELECT '1' code_origine, i.id intervenant_id, i.nom_usuel || ',' || i.prenom nom, - t.prime_id prime_id + t.prime_id prime_id, + t.date_declaration date_declaration FROM ( SELECT @@ -50,7 +51,8 @@ FROM SUM(hpm.total_paie) paie_mission, SUM(hpm.total_heures_a_payer) total_heures_a_payer, SUM(hpm.total_heures_payees) total_heures_payees, - SUM(round(hpm.total_paie * 0.1, 2)) montant_prime + SUM(round(hpm.total_paie * 0.1, 2)) montant_prime, + MAX(f.histo_creation) date_declaration FROM mission_prime mp JOIN mission m ON @@ -68,6 +70,7 @@ FROM JOIN periode p ON p.ecart_mois = ROUND(MONTHS_BETWEEN(m.date_fin, a.date_debut)+ 0.5) AND p.enseignement = 0 + JOIN fichier f ON f.id = mp.declaration_id and f.histo_destruction IS NULL WHERE --Il faut impérativement une prime validée mp.declaration_id IS NOT NULL diff --git a/data/ddl/view/V_EXPORT_SERVICE.sql b/data/ddl/view/V_EXPORT_SERVICE.sql index 30f7516718..cca2a8451a 100644 --- a/data/ddl/view/V_EXPORT_SERVICE.sql +++ b/data/ddl/view/V_EXPORT_SERVICE.sql @@ -115,7 +115,8 @@ SELECT 0 heures, vhr.heures heures_ref, - 0 heures_non_payees, + CASE WHEN mnp.id IS NOT NULL + THEN 1 ELSE 0 END heures_non_payees, mnp.libelle_court motif_non_paiement, t.libelle_court tag, 0 service_fi, -- GitLab