From 9f2ae593f0a128630f2d649e6663404656fc387c Mon Sep 17 00:00:00 2001
From: Antony Le Courtes <antony.lecourtes@unicaen.fr>
Date: Thu, 12 Nov 2020 11:50:50 +0100
Subject: [PATCH] =?UTF-8?q?Modification=20PJF=20pour=20afficher=20les=20PJ?=
=?UTF-8?q?=20non=20demand=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data/ddl/view/V_TBL_PIECE_JOINTE_FOURNIE.sql | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/ddl/view/V_TBL_PIECE_JOINTE_FOURNIE.sql b/data/ddl/view/V_TBL_PIECE_JOINTE_FOURNIE.sql
index 4a7c404344..c9e7181091 100644
--- a/data/ddl/view/V_TBL_PIECE_JOINTE_FOURNIE.sql
+++ b/data/ddl/view/V_TBL_PIECE_JOINTE_FOURNIE.sql
@@ -7,8 +7,8 @@ SELECT
pj.id piece_jointe_id,
v.id validation_id,
f.id fichier_id,
- MIN(tpjs.duree_vie) duree_vie,
- MIN(i.annee_id+tpjs.duree_vie) date_validite,
+ CASE WHEN MIN(tpjs.duree_vie) IS NULL THEN 1 ELSE MIN(tpjs.duree_vie) END duree_vie,
+ CASE WHEN MIN(tpjs.duree_vie) IS NULL THEN i.annee_id+1 ELSE MIN(i.annee_id+tpjs.duree_vie) END date_validite,
pj.date_archive date_archive
FROM
piece_jointe pj
@@ -17,7 +17,7 @@ FROM
JOIN piece_jointe_fichier pjf ON pjf.piece_jointe_id = pj.id
JOIN fichier f ON f.id = pjf.fichier_id
AND f.histo_destruction IS NULL
- JOIN type_piece_jointe_statut tpjs ON tpjs.statut_intervenant_id = i.statut_id
+ LEFT JOIN type_piece_jointe_statut tpjs ON tpjs.statut_intervenant_id = i.statut_id
AND tpjs.type_piece_jointe_id = pj.type_piece_jointe_id
AND tpjs.HISTO_DESTRUCTION IS NULL
--
GitLab