From add1fa05b4ceb0285d058868c23ee2d8765c7333 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Fri, 5 Jul 2024 10:10:00 +0300 Subject: [PATCH] =?utf8?q?[ERP-70]=20=D0=90=D0=B2=D1=82=D0=BE=D0=B7=D0=B0?= =?utf8?q?=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5=20=D1=81=D0=BC=D0=B5=D0=BD?= =?utf8?q?=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=2014=20=D1=87=D0=B0=D1=81?= =?utf8?q?=D0=BE=D0=B2=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20date=5Fstart.'?= =?utf8?q?=20'.time=5Fstat?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/commands/TimetableController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erp24/commands/TimetableController.php b/erp24/commands/TimetableController.php index b67ef3e8..3ffeee40 100644 --- a/erp24/commands/TimetableController.php +++ b/erp24/commands/TimetableController.php @@ -2,6 +2,7 @@ namespace yii_app\commands; +use yii\db\Expression; use yii_app\records\TimetableFactModel; use yii\console\Controller; use yii\helpers\Json; @@ -11,7 +12,7 @@ class TimetableController extends Controller { public function actionAutocloseShifts() { $timetableFactModels = TimetableFactModel::find()->with(['checkinStart'])->where(['status' => AdminCheckin::TYPE_START]) - ->andWhere(['<=', 'date_start', date('Y-m-d H:i:s', strtotime('-14 hours', time()))])->all(); + ->andWhere(['<=', new Expression('CONCAT(date_start, \' \', time_start)'), date('Y-m-d H:i:s', strtotime('-14 hours', time()))])->all(); foreach ($timetableFactModels as $timetableFactModel) { /** @var $timetableFactModel TimetableFactModel */ -- 2.39.5