From b3f6d70cefebc18bd0b1b988ef49294b1332ca01 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 5 Dec 2025 15:39:27 +0300
Subject: [PATCH] =?utf8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8?=
 =?utf8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BD=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?utf8?q?=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api3/core/services/ReportService.php | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php
index cb9a8e91..11555bb5 100644
--- a/erp24/api3/core/services/ReportService.php
+++ b/erp24/api3/core/services/ReportService.php
@@ -967,7 +967,7 @@ class ReportService
 
         $allAdminsInPeriod = TimetableFactModel::find()
             ->select(['admin_id'])
-            ->distinct()
+            //->distinct()
             ->where(['store_id' => $data->stores])
             ->andWhere($cond)
             ->andWhere(['>', 'work_time', 0])
@@ -991,7 +991,7 @@ class ReportService
             foreach ($data->stores as $store_id) {
                 $employees = TimetableFactModel::find()
                     ->select(['admin_id'])
-                    ->distinct()
+                    //->distinct()
                     ->where(['store_id' => $store_id])
                     ->andWhere(['>=', 'date', date("Y-m-d", strtotime($dateStartEnd[0]))])
                     ->andWhere(['<=', 'date', date("Y-m-d", strtotime($dateStartEnd[1]))])
@@ -1541,23 +1541,6 @@ class ReportService
                 }
             }
 
-            // Дедупликация $allDayEmployees для корректного подсчета total
-            // Для shift_type == 0 дедуплицируем по (admin_id, shift_id)
-            // Для других типов дедуплицируем по admin_id
-//            $uniqueEmployees = [];
-//            foreach ($allDayEmployees as $employee) {
-//                if ($data->shift_type == 0) {
-//                    $key = $employee['admin_id'] . '_' . $employee['shift_id'];
-//                } else {
-//                    $key = $employee['admin_id'];
-//                }
-//                if (!isset($uniqueEmployees[$key])) {
-//                    $uniqueEmployees[$key] = $employee;
-//                }
-//            }
-        //    $allDayEmployees = array_values($uniqueEmployees);
-
-
             $storeVisitorsQuantityTotal = [];
             $storeSaleQuantityTotal = [];
             $storeSaleTotalTotal = [];
-- 
2.39.5