Корректировка общего отчета и подсчтета недель

diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php
index 1f0e71c4af1ea2b328e92c86b1987bc225337c9b..e810a6287edd242da5d897b555a184a54fd4c4b8 100644 (file)
--- a/erp24/api3/core/services/ReportService.php
+++ b/erp24/api3/core/services/ReportService.php
@@ -1529,15 +1529,13 @@ class ReportService
                 // Для shift_type == 0 считаем каждую смену отдельно
                 if ($data->shift_type == 0) {
                     $employees = $employeesQuery
-                        ->select(['admin_id', 'shift_id'])
-                        //->distinct()
+                        ->select(['admin_id', 'shift_id'])                       
                         ->asArray()
                         ->all();
                 } else {
-                    // Для конкретной смены используем distinct
+                    
                     $employees = $employeesQuery
-                        ->select(['admin_id'])
-                        //->distinct()
+                        ->select(['admin_id'])                        
                         ->asArray()
                         ->all();
                 }