From b91ac4857b81833d4ebb805a9738f483f49df290 Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Mon, 17 Nov 2025 17:12:33 +0300 Subject: [PATCH] =?utf8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?utf8?q?=D0=B8=D0=B5=20=D0=B0=D0=BB=D0=B8=D0=B0=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api3/core/services/ReportService.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php index dea5f2da..42b96d22 100644 --- a/erp24/api3/core/services/ReportService.php +++ b/erp24/api3/core/services/ReportService.php @@ -339,7 +339,7 @@ class ReportService ->andWhere(['>=', 'date', date("Y-m-01", strtotime($data->date_start))]) ->andWhere(['<=', 'date', $data->date_end]) ->andWhere(['tabel' => 0, 'slot_type_id' => Timetable::TIMESLOT_WORK]) - ->andWhere(['active' => 1]) + ->andWhere(['t.active' => 1]) ->asArray()->all(); $adminIdsInPeriod = ArrayHelper::getColumn($allAdminsInPeriod, 'admin_id'); @@ -359,7 +359,7 @@ class ReportService ->andWhere(['>=', 'date', date("Y-m-01", strtotime($currentDate))]) ->andWhere(['<=', 'date', $currentDate]) ->andWhere(['shift_id' => $shift_id, 'tabel' => 0, 'slot_type_id' => Timetable::TIMESLOT_WORK]) - ->andWhere(['active' => 1]) + ->andWhere(['t.active' => 1]) ->asArray()->all(); $timetables = Timetable::find()->alias('t')->select(['admin_id', 'a.name as adminName', 't.store_id', 't.shift_id']) @@ -367,7 +367,7 @@ class ReportService ->where(['t.store_id' => $data->stores]) ->andWhere(['date' => $currentDate, 'tabel' => 0]) ->andWhere(['shift_id' => $shift_id, 'slot_type_id' => Timetable::TIMESLOT_WORK]) - ->andWhere(['active' => 1]) + ->andWhere(['t.active' => 1]) ->asArray()->all(); $adminIdsMonth = ArrayHelper::getColumn($timetablesMonth, 'admin_id'); -- 2.39.5