This commit is contained in:
Mathieu Jaumotte 2023-09-28 16:57:08 +02:00
parent f025b0d184
commit eddcfc3921
8 changed files with 17 additions and 9 deletions

View File

@ -61,7 +61,8 @@ class ActivityUsersJobAggregator implements AggregatorInterface
) )
->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['job_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['job_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }

View File

@ -61,7 +61,8 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
) )
->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['scope_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['scope_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }

View File

@ -61,7 +61,8 @@ class CreatorScopeAggregator implements AggregatorInterface
) )
->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['scope_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['scope_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }

View File

@ -63,7 +63,8 @@ class ByUserJobAggregator implements AggregatorInterface
) )
->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['job_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['job_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }

View File

@ -61,7 +61,8 @@ class ByUserScopeAggregator implements AggregatorInterface
) )
->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['scope_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['scope_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }

View File

@ -61,7 +61,8 @@ class CreatorJobAggregator implements AggregatorInterface
) )
->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['job_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['job_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }

View File

@ -48,7 +48,7 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
AccompanyingPeriodInfo::class, AccompanyingPeriodInfo::class,
"acpinfo", "acpinfo",
Join::WITH, Join::WITH,
$qb->expr()->eq( "IDENTITY(acpinfo.accompanyingPeriod)", "acp.id") $qb->expr()->eq("IDENTITY(acpinfo.accompanyingPeriod)", "acp.id")
) )
->leftJoin("acpinfo.user", "{$p}_user") ->leftJoin("acpinfo.user", "{$p}_user")
->leftJoin( ->leftJoin(
@ -68,7 +68,8 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
) )
->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['job_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['job_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }

View File

@ -68,7 +68,8 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa
) )
->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
->setParameter( ->setParameter(
"{$p}_at", $this->rollingDateConverter->convert($data['scope_at']) "{$p}_at",
$this->rollingDateConverter->convert($data['scope_at'])
) )
->addGroupBy("{$p}_select"); ->addGroupBy("{$p}_select");
} }