diff --git a/data/ddl/view/V_INDICATEUR_550.sql b/data/ddl/view/V_INDICATEUR_550.sql index 93c17a7a49af2323e23096e1976c83a04b780819..3049736741efaee1398611dc37ff50c5a2853b65 100644 --- a/data/ddl/view/V_INDICATEUR_550.sql +++ b/data/ddl/view/V_INDICATEUR_550.sql @@ -7,12 +7,12 @@ FROM tbl_workflow w JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id JOIN intervenant i ON i.id = wc.intervenant_id + JOIN statut s ON s.id = i.statut_id JOIN structure s ON s.id = w.structure_id WHERE w.etape_code = 'SERVICE_VALIDATION_REALISE' AND w.objectif > w.realisation AND w.atteignable = 1 - - AND wc.etape_code = 'CLOTURE_REALISE' + AND (wc.etape_code = 'CLOTURE_REALISE' AND s.cloture = 1) AND wc.objectif = wc.realisation AND w.structure_id <> i.structure_id \ No newline at end of file diff --git a/data/ddl/view/V_INDICATEUR_560.sql b/data/ddl/view/V_INDICATEUR_560.sql index d2d961db5b440777238d13e2d0105234c166a641..9050d1ec9a31958402ccc1281483e574d1bac356 100644 --- a/data/ddl/view/V_INDICATEUR_560.sql +++ b/data/ddl/view/V_INDICATEUR_560.sql @@ -9,13 +9,14 @@ FROM JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id JOIN intervenant i ON i.id = wc.intervenant_id JOIN structure s ON s.id = w.structure_id + JOIN statut s ON s.id = i.statut_id LEFT JOIN HISTO_INTERVENANT_SERVICE his ON his.INTERVENANT_ID = w.intervenant_id WHERE w.etape_code = 'REFERENTIEL_VALIDATION_REALISE' AND w.objectif > w.realisation AND w.atteignable = 1 - AND wc.etape_code = 'CLOTURE_REALISE' + AND (wc.etape_code = 'CLOTURE_REALISE' AND s.cloture = 1) AND wc.objectif = wc.realisation AND w.structure_id = i.structure_id diff --git a/data/ddl/view/V_INDICATEUR_570.sql b/data/ddl/view/V_INDICATEUR_570.sql index cba3683412375bfb37ac006339c96441acbeed1c..5e2ea2e9986be485342d370806d089411ddaa3a7 100644 --- a/data/ddl/view/V_INDICATEUR_570.sql +++ b/data/ddl/view/V_INDICATEUR_570.sql @@ -7,12 +7,13 @@ FROM tbl_workflow w JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id JOIN intervenant i ON i.id = wc.intervenant_id + JOIN statut s ON s.id = i.statut_id JOIN structure s ON s.id = w.structure_id WHERE w.etape_code = 'REFERENTIEL_VALIDATION_REALISE' AND w.objectif > w.realisation AND w.atteignable = 1 - AND wc.etape_code = 'CLOTURE_REALISE' + AND (wc.etape_code = 'CLOTURE_REALISE' AND s.cloture =1) AND wc.objectif = wc.realisation AND w.structure_id <> i.structure_id \ No newline at end of file