diff --git a/module/Contrat/src/Controller/ContratController.php b/module/Contrat/src/Controller/ContratController.php index 56f7e6853b7469a6044ac68584b195471be17bb7..b194c6eb9936f1a441e29196367d1bfb6598b42b 100755 --- a/module/Contrat/src/Controller/ContratController.php +++ b/module/Contrat/src/Controller/ContratController.php @@ -176,9 +176,6 @@ class ContratController extends AbstractController } $volumeHorairesTotal = $this->getServiceTblContrat()->getVolumeTotalCreationContratByUuid($uuid); - if ($volumeHorairesTotal == null) { - $volumeHorairesTotal = 0; - } $contrat = $this->getProcessusContrat()->creer($intervenant, $volumeHorairesTotal); diff --git a/module/Contrat/src/Service/TblContratService.php b/module/Contrat/src/Service/TblContratService.php index 714f4fe331f72dcacbabd217ad746880dca15ab3..4e2ddee6094eb32b790dcc04234994094572fcde 100755 --- a/module/Contrat/src/Service/TblContratService.php +++ b/module/Contrat/src/Service/TblContratService.php @@ -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)