From bba4df9d3f2954152e3e98af99b1e0107d8dfc5e Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Mon, 13 May 2024 10:07:24 +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=20=D1=81?= =?utf8?q?=20=D0=B7=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/payroll/ListAdminsAction.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/erp24/actions/payroll/ListAdminsAction.php b/erp24/actions/payroll/ListAdminsAction.php index 60a5e35..1c1f955 100755 --- a/erp24/actions/payroll/ListAdminsAction.php +++ b/erp24/actions/payroll/ListAdminsAction.php @@ -177,16 +177,17 @@ class ListAdminsAction extends Action ->scalar(); $lastPacketDate = date('d.m.Y H:i:s', $lastPacketNum); - - $adminPayrollCurrentLk = AdminPayrollHistory::find() - ->select(['admin_id', 'admin_payroll_history.value_number AS value']) - ->andWhere(['year' => $yearSelect]) - ->andWhere(['group_number' => AdminPayrollHistory::GROUP_VALUE_ALL_TOTAL_PAYROLL]) - ->andWhere(['month' => $monthWithZeroSelect]) - ->andWhere(['packet_num' => $lastPacketNum]) - ->indexBy('admin_id') - ->asArray() - ->all(); + $adminPayrollCurrentLk=[]; +// +// $adminPayrollCurrentLk = AdminPayrollHistory::find() +// ->select(['admin_id', 'admin_payroll_history.value_number AS value']) +// ->andWhere(['year' => $yearSelect]) +// ->andWhere(['group_number' => AdminPayrollHistory::GROUP_VALUE_ALL_TOTAL_PAYROLL]) +// ->andWhere(['month' => $monthWithZeroSelect]) +// ->andWhere(['packet_num' => $lastPacketNum]) +// ->indexBy('admin_id') +// ->asArray() +// ->all(); $sumColumnByAlias = []; -- 2.39.5