From 1bf4568da777485ae375630cf49844e72d178112 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Tue, 16 Apr 2024 09:44:04 +0300 Subject: [PATCH] =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?utf8?q?=D0=BE=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D1=83=20=D1=81=D0=BE?= =?utf8?q?=D1=82=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/infoTable/TestAction.php | 6 +++--- erp24/actions/payroll/ListAdminsAction.php | 6 +++--- erp24/actions/payroll/StoreAction.php | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/erp24/actions/infoTable/TestAction.php b/erp24/actions/infoTable/TestAction.php index 263db918..59441d5e 100644 --- a/erp24/actions/infoTable/TestAction.php +++ b/erp24/actions/infoTable/TestAction.php @@ -186,14 +186,14 @@ class TestAction extends Action 'admin_id', 'matrix_pay' =>new \yii\db\Expression( 'SUM( - `admin_payroll_values`.`value_float` + admin_payroll_values.value_float )'), 'matrix_pay_percent' =>new \yii\db\Expression( 'SUM( - `admin_payroll_values`.`value_float` + admin_payroll_values.value_float ) * 0.3') ]) - ->leftJoin('admin_payroll_values','`admin_payroll`.`id` = `admin_payroll_values`.`payroll_id` AND `admin_payroll_values`.`value_id` IN (78, 80) ') + ->leftJoin('admin_payroll_values','admin_payroll.id = admin_payroll_values.payroll_id AND admin_payroll_values.value_id IN (78, 80) ') ->andWhere(['year' => 2023,'month' => 6]) ->groupBy('admin_id') ; diff --git a/erp24/actions/payroll/ListAdminsAction.php b/erp24/actions/payroll/ListAdminsAction.php index 52ddee70..60a5e35f 100755 --- a/erp24/actions/payroll/ListAdminsAction.php +++ b/erp24/actions/payroll/ListAdminsAction.php @@ -110,11 +110,11 @@ class ListAdminsAction extends Action $monthNameSelect = HtmlHelper::getMonthName($monthWithZeroSelect); $adminPayrollQuery = AdminPayroll::find() - ->andWhere(['`admin_payroll`.`date`' => $yearSelect . '-' . $monthWithZeroSelect]) + ->andWhere(['admin_payroll.date' => $yearSelect . '-' . $monthWithZeroSelect]) ->with('admin') ->with('store') - ->leftJoin('admin','`admin_payroll`.`admin_id` = `admin`.`id`') - ->orderBy(['`admin`.`name_full`' => SORT_ASC]) + ->leftJoin('admin','admin_payroll.admin_id = admin.id') + ->orderBy(['admin.name_full' => SORT_ASC]) ; $adminPayrollResult = $adminPayrollQuery -> asArray()->all(); diff --git a/erp24/actions/payroll/StoreAction.php b/erp24/actions/payroll/StoreAction.php index 75f07141..3309c181 100755 --- a/erp24/actions/payroll/StoreAction.php +++ b/erp24/actions/payroll/StoreAction.php @@ -101,11 +101,11 @@ class StoreAction extends Action $monthNameSelect = HtmlHelper::getMonthName($monthWithZeroSelect); $adminPayrollQuery = AdminPayroll::find() - ->andWhere(['`admin_payroll`.`date`' => $yearSelect . '-' . $monthWithZeroSelect]) - ->andWhere(['`admin_payroll`.`store_id`' => $storeId]) + ->andWhere(['admin_payroll.date' => $yearSelect . '-' . $monthWithZeroSelect]) + ->andWhere(['admin_payroll.store_id' => $storeId]) ->with('admin') - ->leftJoin('admin','`admin_payroll`.`admin_id` = `admin`.`id`') - ->orderBy(['`admin`.`name_full`' => SORT_ASC]) + ->leftJoin('admin','admin_payroll.admin_id = admin.id') + ->orderBy(['admin.name_full' => SORT_ASC]) ; $adminPayrollResult = $adminPayrollQuery -> asArray()->all(); -- 2.39.5