Commit 745e1726 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

MAJ UnicaenTbl

parent f2cf53dc
Loading
Loading
Loading
Loading
+12 −12
Changes for data/ddl/package/UNICAEN_TBL/body.sql: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -1648,7 +1648,8 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
            s.intervenant_id,
            SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NULL THEN vh.heures ELSE 0 END) heures,
            SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NOT NULL THEN vh.heures ELSE 0 END) heures_non_payables,
            SUM(ep.taux_fc) fc
            --SUM(ep.taux_fc) fc
            SUM(CASE WHEN ep.taux_fc > 0 THEN vh.heures ELSE 0 END) fc
          FROM
                 service               s
            JOIN type_volume_horaire tvh ON tvh.code = ''PREVU''
@@ -1675,8 +1676,7 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
          GROUP BY
            intervenant_id
        )
        SELECT
          i.annee_id                        annee_id,
        SELECT i.annee_id                        annee_id,
               i.code                            code_intervenant,
               i.id                              intervenant_id,
               tpj.id                            type_piece_jointe_id,
@@ -1684,15 +1684,14 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
               MAX(tpjs.obligatoire)             obligatoire,
               MAX(COALESCE(hetd.total_hetd, 0)) heures_pour_seuil_hetd,
               MIN(tpjs.duree_vie)               duree_vie
        FROM
                    intervenant                 i
        FROM intervenant i
                 LEFT JOIN intervenant_dossier d ON d.intervenant_id = i.id AND d.histo_destruction IS NULL
               JOIN type_piece_jointe_statut tpjs ON tpjs.statut_id = i.statut_id AND tpjs.histo_destruction IS NULL AND i.annee_id = tpjs.annee_id
                 JOIN type_piece_jointe_statut tpjs
                      ON tpjs.statut_id = i.statut_id AND tpjs.histo_destruction IS NULL AND i.annee_id = tpjs.annee_id
                 JOIN type_piece_jointe tpj ON tpj.id = tpjs.type_piece_jointe_id AND tpj.histo_destruction IS NULL
                 LEFT JOIN i_h ON i_h.intervenant_id = i.id
                 LEFT JOIN hetd ON hetd.intervenant_id = i.id
        WHERE
          i.histo_destruction IS NULL
        WHERE i.histo_destruction IS NULL
            /*@INTERVENANT_ID=i.id*/
            /*@ANNEE_ID=i.annee_id*/

@@ -1708,16 +1707,17 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
          AND CASE
                  WHEN tpjs.changement_rib = 0 OR d.id IS NULL
                      THEN 1
              ELSE CASE WHEN
                  ELSE CASE
                           WHEN
                                       replace(i.bic, '' '', '''') = replace(d.bic, '' '', '''')
                                   AND replace(i.iban, '' '', '''') = replace(d.iban, '' '', '''')
              THEN 0 ELSE 1 END
                               THEN 0
                           ELSE 1 END
                  END = 1

          -- Filtre FC
          AND (tpjs.fc = 0 OR i_h.fc > 0)
        GROUP BY
          i.annee_id,
        GROUP BY i.annee_id,
                 i.id,
                 i.code,
                 tpj.id';