diff --git a/data/ddl/view/V_INDICATEUR_330.sql b/data/ddl/view/V_INDICATEUR_330.sql index 53f1b6a30d74e02511c99e7221a7d1b7958cadf9..84c1c3d7169031d17edecebe31e915f6b2768959 100644 --- a/data/ddl/view/V_INDICATEUR_330.sql +++ b/data/ddl/view/V_INDICATEUR_330.sql @@ -1,11 +1,16 @@ CREATE OR REPLACE FORCE VIEW V_INDICATEUR_330 AS WITH has_contrat AS ( SELECT DISTINCT - intervenant_id + i.id intervenant_id, + i.annee_id annee_id, + c.structure_id structure_id FROM - tbl_contrat + intervenant i + JOIN contrat c ON c.intervenant_id = i.iD WHERE - edite > 0 + c.type_contrat_id = 1 --a déjà un contrat de type 'CONTRAT' + AND c.histo_destruction IS NULL + AND i.histo_destruction IS NULL ) SELECT rownum id, @@ -13,10 +18,13 @@ SELECT w.intervenant_id, w.structure_id FROM - tbl_workflow w - JOIN has_contrat hc ON hc.intervenant_id = w.intervenant_id + intervenant i + JOIN tbl_workflow w ON w.intervenant_id = i.id + JOIN has_contrat hc ON hc.intervenant_id = i.id + LEFT JOIN contrat c ON c.intervenant_id = i.id AND c.structure_id = w.structure_id AND c.histo_destruction IS NULL WHERE w.atteignable = 1 AND w.etape_code = 'CONTRAT' AND w.objectif > 0 - AND w.realisation < w.objectif \ No newline at end of file + AND w.realisation < w.objectif + AND c.id IS NULL \ No newline at end of file