From 45d2d106ea7d8b7821139b6a0a0e53341a5b3a66 Mon Sep 17 00:00:00 2001
From: "florian.joriot@unicaen.fr" <florian.joriot@unicaen.fr>
Date: Thu, 6 Feb 2025 14:38:39 +0100
Subject: [PATCH] Correction probleme calcul de tbl contrat
---
module/Contrat/src/Controller/ContratController.php | 3 ---
module/Contrat/src/Service/TblContratService.php | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/module/Contrat/src/Controller/ContratController.php b/module/Contrat/src/Controller/ContratController.php
index 56f7e6853b..b194c6eb99 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 714f4fe331..4e2ddee609 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)
--
GitLab