From cd3f84c108890b27eb98fa2173e2647677719e40 Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Wed, 10 Dec 2025 10:14:00 +0300 Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B4=D0=B8?= =?utf8?q?=D1=81=D1=82=D0=B8=D0=BD=D0=BA=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api3/core/services/ReportService.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php index 2d9d77dd..750100ba 100644 --- a/erp24/api3/core/services/ReportService.php +++ b/erp24/api3/core/services/ReportService.php @@ -977,7 +977,6 @@ class ReportService $allAdminsInPeriod = TimetableFactModel::find() ->select(['admin_id']) - //->distinct() ->where(['store_id' => $data->stores]) ->andWhere($cond) ->andWhere(['>', 'work_time', 0]) @@ -1002,7 +1001,6 @@ class ReportService foreach ($data->stores as $store_id) { $employees = TimetableFactModel::find() ->select(['admin_id', 'shift_id']) - //->distinct() ->where(['store_id' => $store_id]) ->andWhere(['>=', 'date', date("Y-m-d", strtotime($dateStartEnd[0]))]) ->andWhere(['<=', 'date', date("Y-m-d", strtotime($dateStartEnd[1]))]) @@ -1489,7 +1487,6 @@ class ReportService // Для обеих смен нужны уникальные комбинации admin_id и shift_id $allAdminsInPeriod = $allAdminsInPeriodQuery ->select(['admin_id', 'shift_id']) - //->distinct() ->asArray() ->all(); $employeeCountTotal = count($allAdminsInPeriod); @@ -1499,7 +1496,6 @@ class ReportService } else { $allAdminsInPeriod = $allAdminsInPeriodQuery ->select(['admin_id']) - //->distinct() ->asArray() ->all(); $adminIdsInPeriod = ArrayHelper::getColumn($allAdminsInPeriod, 'admin_id'); -- 2.39.5