From: Aleksey Filippov Date: Mon, 13 May 2024 07:07:24 +0000 (+0300) Subject: правки по списку сотрудников с зп X-Git-Tag: 1.1~37^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=bba4df9d3f2954152e3e98af99b1e0107d8dfc5e;p=erp24_rep%2Fyii-erp24%2F.git правки по списку сотрудников с зп --- diff --git a/erp24/actions/payroll/ListAdminsAction.php b/erp24/actions/payroll/ListAdminsAction.php index 60a5e35f..1c1f9554 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 = [];