From 8cbaadddb7f0f789dc1d4600b6d79a3d2f878b6c Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 9 Sep 2024 15:54:22 +0300 Subject: [PATCH] =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B4?= =?utf8?q?=D0=BB=D1=8F=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?utf8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?= =?utf8?q?=D0=B2=20=D1=82=D0=B5=D0=BB=D0=B5=D0=B3=D1=80=D0=B0=D0=BC=20?= =?utf8?q?=D0=B1=D0=BE=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api3/modules/v1/models/timetable/Timetable.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erp24/api3/modules/v1/models/timetable/Timetable.php b/erp24/api3/modules/v1/models/timetable/Timetable.php index 80133fef..240e0491 100644 --- 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 -- 2.39.5