корректировка недель

diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php
index cb9a8e915569e1a88f4143546c0a523c2ebce692..11555bb5768124c1798b58a0ed7a2a0134d8462b 100644 (file)
--- 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 = [];