правка для отображения данных в телеграм боте

diff --git a/erp24/api3/modules/v1/models/timetable/Timetable.php b/erp24/api3/modules/v1/models/timetable/Timetable.php
index 80133fef61f4ef09ac1b885beb32e4138e3de7f1..240e04910b5fc03ebb2363e3ee407bbc73384f46 100644 (file)
--- a/erp24/api3/modules/v1/models/timetable/Timetable.php
+++ b/erp24/api3/modules/v1/models/timetable/Timetable.php
@@ -190,8 +190,8 @@ class Timetable extends \yii_app\records\TimetableV3
             return $this->hasMany(AdminCheckin::class, ['plan_id' => 'id']);
         } else {
             return $this->hasMany(AdminCheckin::class, ['admin_id' => 'admin_id'])
-                ->andWhere(['BETWEEN', 'datetime_start', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
-                ->andWhere(['BETWEEN', 'datetime_end', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')]);
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')]);
 
 //           return $this->hasOne(AdminCheckin::class, ['admin_id' => 'id'])
 //                ->andWhere(['>=', 'date', date('Y-m-d 00:00:00')])
@@ -205,8 +205,8 @@ class Timetable extends \yii_app\records\TimetableV3
             return $this->hasMany(AdminCheckin::class, ['plan_id' => 'id'])->count();
         } else {
             return $this->hasMany(AdminCheckin::class, ['admin_id' => 'admin_id'])
-                ->andWhere(['BETWEEN', 'datetime_start', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
-                ->andWhere(['BETWEEN', 'datetime_end', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')])->count();
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')])->count();
         }
     }
 }
\ No newline at end of file