From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 5 Jul 2024 07:10:00 +0000 (+0300)
Subject: [ERP-70] Автозакрытие смен через 14 часов после date_start.' '.time_stat
X-Git-Tag: 1.3~10^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=add1fa05b4ceb0285d058868c23ee2d8765c7333;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-70] Автозакрытие смен через 14 часов после date_start.' '.time_stat
---

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 */