Commit 45d2d106 authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction probleme calcul de tbl contrat

parent 69d5793d
Loading
Loading
Loading
Loading
Loading
+0 −3
Changes for module/Contrat/src/Controller/ContratController.php: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -176,9 +176,6 @@ class ContratController extends AbstractController
        }

        $volumeHorairesTotal = $this->getServiceTblContrat()->getVolumeTotalCreationContratByUuid($uuid);
        if ($volumeHorairesTotal == null) {
            $volumeHorairesTotal = 0;
        }

        $contrat = $this->getProcessusContrat()->creer($intervenant, $volumeHorairesTotal);

+2 −2
Changes for module/Contrat/src/Service/TblContratService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class TblContratService extends AbstractEntityService
    {
        $em = $this->getEntityManager();

        $dql = 'SELECT SUM(tblc.hetd) AS hetdTotal, tblc.uuid, i.id AS intervenantId, s.id AS structureId, tblc.dateDebut, tblc.dateFin, cp.id AS contratParentId, tc.code AS typeContratCode
        $dql = 'SELECT SUM(tblc.hetd) AS hetdTotal, tblc.uuid, i.id AS intervenantId, s.id AS structureId, MIN(tblc.dateDebut) AS dateDebut, MAX(tblc.dateFin) AS dateFin, cp.id AS contratParentId, tc.code AS typeContratCode
        FROM ' . TblContrat::class . ' tblc
        JOIN tblc.typeContrat tc
        JOIN tblc.intervenant i
@@ -81,7 +81,7 @@ class TblContratService extends AbstractEntityService
        LEFT JOIN tblc.contratParent cp
        WHERE tblc.uuid = :uuid
        AND tblc.actif = 1
        GROUP BY tblc.uuid, i.id, s.id, tblc.dateDebut, tblc.dateFin, cp.id, tc.code';
        GROUP BY tblc.uuid, i.id, s.id, cp.id, tc.code';


        $query = $em->createQuery($dql)