From 967c80b3a1caf255052bc6ac78419f8b55ecc389 Mon Sep 17 00:00:00 2001 From: vladfo Date: Thu, 10 Oct 2024 12:12:54 +0300 Subject: [PATCH] =?utf8?q?=D1=81=D0=BC=D0=B5=D0=BD=D0=B0=20date=5Fshift=20?= =?utf8?q?=D0=BD=D0=B0=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index fcb72b15..aa678da4 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -801,7 +801,7 @@ class MotivationService // Делаем запрос к TimetableFactModel $records = TimetableFactModel::find() - ->select(['DISTINCT ON (date_shift, admin_id) *']) + ->select(['DISTINCT ON (date, admin_id) *']) ->where(['store_id' => $storeId]) ->andWhere(['between', 'date', $startDate, $endDate]) ->orderBy(['date' => SORT_ASC, 'admin_id' => SORT_ASC, 'id' => SORT_ASC]) -- 2.39.5