]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
[ERP-69] метод для сбора данных по отработанным сменам из нового факта fix origin/feature_smirnov_erp-69_select_timetable_fact_models
authorAlexander Smirnov <fredeom@mail.ru>
Wed, 26 Jun 2024 13:04:49 +0000 (16:04 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Wed, 26 Jun 2024 13:04:49 +0000 (16:04 +0300)
erp24/records/TimetableFactModel.php

index fa9dc1592403d479932985c3496af321ef5b77cf..48d3304245b6b0ef19872ad6bd548321242040e7 100644 (file)
@@ -211,11 +211,9 @@ class TimetableFactModel extends ActiveRecord
         $timetableFactModels = TimetableFactModel::find()->where([
                 'admin_id' => $admin_id,
                 'status' => AdminCheckin::TYPE_END,
-                'date_start' => date('Y-m-d', strtotime($date_start)),
-                'date_end' => date('Y-m-d', strtotime($date_end))
             ])
-            ->andWhere(['<=', 'date_start', date('Y-m-d', strtotime($date_start))])
-            ->andWhere(['>=', 'date_end', date('Y-m-d', strtotime($date_end))])
+            ->andWhere(['>=', 'date_start', date('Y-m-d', strtotime($date_start))])
+            ->andWhere(['<=', 'date_end', date('Y-m-d', strtotime($date_end))])
             ->all();
         return $timetableFactModels;
     }