ERP-65

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

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index 2bf494278e4308d4589e9fb5df569abfeaa14eb2..197076e9d27fe617a6214dccc240cf3b3f86f070 100644 (file)
--- 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();