From 8b8f887fb6dbea73f5437fc50044f41a97a9b7fe Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 28 Aug 2024 09:57:10 +0300 Subject: [PATCH] =?utf8?q?ERP-85=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?utf8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BE=D0=B1=D0=BC=D0=B5=D0=BD?= =?utf8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=201=D0=A1=20?= =?utf8?q?=D0=91=D1=83=D1=85=D0=B3=D0=B0=D0=BB=D1=82=D0=B5=D1=80=D0=B8?= =?utf8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ..._data_to_monitvation_from_motivation_buh.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php b/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php index 8dd2ad02..d229169b 100644 --- a/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php +++ b/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php @@ -67,17 +67,24 @@ try { $schedulerTaskLog->save(); } - $motivationGroup = MotivationValueGroup::findOne(['alias' => 'week' . Motivation::getWeek()]); + $month = MotivationBuh::find() + ->select('id') + ->andWhere(['month' => intval(date('m'))]) + ->andWhere(['year' => intval(date('Y'))]) + ->asArray() + ->column(); + $motivationBuhValue = MotivationBuhValue::find() - ->andWhere(['motivation_group_id' => $motivationGroup->id]) - ->groupBy('store_id, value_id, motivation_buh_id') + ->andWhere(['motivation_buh_id' => $month]) + ->groupBy('store_id, value_id, motivation_buh_id, motivation_group_id') ->select([ new Expression( 'sum(value_float) as value_float, motivation_buh_id as motivation_buh_id, value_id as value_id, - store_id as store_id' + store_id as store_id, + motivation_group_id as motivation_group_id' ) ]) ->all(); @@ -104,7 +111,7 @@ try { $motivationValue = new MotivationValue(); $motivationValue->setAttributes([ 'motivation_id' => $motivation->id, - 'motivation_group_id' => $motivationGroup->id, + 'motivation_group_id' => $value->id, 'value_id' => $value->value_id, 'value_type' => MotivationCostsItem::DATA_TYPE_FLOAT, 'value_float' => $value->value_float, -- 2.39.5