From: vladfo Date: Thu, 10 Oct 2024 09:12:54 +0000 (+0300) Subject: смена date_shift на date X-Git-Tag: 1.6~35^2~4 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=967c80b3a1caf255052bc6ac78419f8b55ecc389;p=erp24_rep%2Fyii-erp24%2F.git смена date_shift на date --- 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])