From 8d1c33c2a7d2a74a7f26427559fcae003092a862 Mon Sep 17 00:00:00 2001
From: Antony Le Courtes <antony.lecourtes@unicaen.fr>
Date: Tue, 18 Feb 2025 13:37:15 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20ind=C3=A9mnit=C3=A9=20fin=20de=20c?=
=?UTF-8?q?ontrat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
module/Mission/src/Service/PrimeService.php | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/module/Mission/src/Service/PrimeService.php b/module/Mission/src/Service/PrimeService.php
index a0ab2213cc..9a36903fa5 100755
--- a/module/Mission/src/Service/PrimeService.php
+++ b/module/Mission/src/Service/PrimeService.php
@@ -2,21 +2,16 @@
namespace Mission\Service;
-use Application\Acl\Role;
+
use Application\Entity\Db\Fichier;
-use Application\Entity\Db\Validation;
-use Application\Provider\Privilege\Privileges;
use Application\Service\AbstractEntityService;
use Application\Service\Traits\FichierServiceAwareTrait;
use Application\Service\Traits\SourceServiceAwareTrait;
use Application\Service\Traits\TypeValidationServiceAwareTrait;
use Application\Service\Traits\ValidationServiceAwareTrait;
-use Contrat\Entity\Db\Contrat;
-use Mission\Assertion\SaisieAssertion;
-use Mission\Entity\Db\Candidature;
+use Contrat\Entity\Db\TblContrat;
use Mission\Entity\Db\Mission;
use Mission\Entity\Db\Prime;
-use Mission\Entity\Db\VolumeHoraireMission;
use Service\Service\TypeVolumeHoraireServiceAwareTrait;
use UnicaenVue\View\Model\AxiosModel;
@@ -215,15 +210,15 @@ class PrimeService extends AbstractEntityService
$dql = "
SELECT
- c,m,t
+ tc,m,t
FROM
- " . Contrat::class . " c
- JOIN c.mission m
+ " . TblContrat::class . " tc
+ JOIN tc.mission m
JOIN m.typeMission t
WHERE
- c.dateRetourSigne IS NOT NULL
+ tc.signe = 1
" . dqlAndWhere([
- 'intervenant' => 'c.intervenant',
+ 'intervenant' => 'tc.intervenant',
], $parameters) . "
ORDER BY
m.dateDebut
@@ -231,7 +226,9 @@ class PrimeService extends AbstractEntityService
$query = $this->getEntityManager()->createQuery($dql)->setParameters($parameters);
+
$contrats = $query->getResult();
+
$missions = [];
foreach ($contrats as $contrat) {
--
GitLab