From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Tue, 16 Apr 2024 06:44:04 +0000 (+0300)
Subject: правки по списку сотрудников
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1bf4568da777485ae375630cf49844e72d178112;p=yii-erp24%2F.git

правки по списку сотрудников
---

diff --git a/erp24/actions/infoTable/TestAction.php b/erp24/actions/infoTable/TestAction.php
index 263db91..59441d5 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 52ddee7..60a5e35 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 75f0714..3309c18 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();