From: marina <m.zozirova@gmail.com>
Date: Fri, 5 Jul 2024 03:14:00 +0000 (+0300)
Subject: ERP-65
X-Git-Tag: 1.3~17^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=174e3c95fb32678357ea00aa8e6c1dae514e8b46;p=erp24_rep%2Fyii-erp24%2F.git

ERP-65
Перенести в новый фактический табель все смены сотрудников, которые были до 13.06
---

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index 2bf49427..197076e9 100644
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -160,7 +160,7 @@ class TimetableFactController extends Controller
             ->andWhere(new \yii\db\Expression('EXISTS (SELECT 1 FROM admin_checkin ac WHERE ac.plan_id = "t".id)'))
             ->select([
                 't.*',
-                new \yii\db\Expression('(SELECT ARRAY(SELECT ac.id FROM admin_checkin ac WHERE ac.plan_id = t.id)) AS admin_checkin_ids'),
+                'admin_checkin_ids' => new \yii\db\Expression('(SELECT ARRAY(SELECT ac.id FROM admin_checkin ac WHERE ac.plan_id = t.id))'),
             ]);
 
         if ($action == 'applyPlus') {
@@ -179,12 +179,12 @@ class TimetableFactController extends Controller
                     $newFact->save();
                 } else {
                     $adminCheckinStart = AdminCheckin::find()
-                        ->where(['plan_id' => $timetable->id])
+                        ->andWhere(['plan_id' => $timetable->id])
                         ->orderBy('id asc')
                         ->one();
 
                     $adminCheckinEnd = AdminCheckin::find()
-                        ->where(['plan_id' => $timetable->id])
+                        ->andWhere(['plan_id' => $timetable->id])
                         ->orderBy('id desc')
                         ->one();