From: Aleksey Filippov Date: Fri, 3 May 2024 06:48:48 +0000 (+0300) Subject: правки по запуску зарплатной ведомости X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=60bff39a30a3bb98c7b2bc36946971d3f5cb2de1;p=yii-erp24%2F.git правки по запуску зарплатной ведомости --- diff --git a/erp24/commands/AssignmentController.php b/erp24/commands/AssignmentController.php index 26fd231..d743e27 100644 --- a/erp24/commands/AssignmentController.php +++ b/erp24/commands/AssignmentController.php @@ -44,8 +44,8 @@ class AssignmentController extends Controller if (!empty($uploadArrayInfo['start'])) { $start = $uploadArrayInfo['start']; - $startCheck = time() - 180; -// $startCheck = time() - 7200; +// $startCheck = time() - 180; + $startCheck = time() - 7200; if ($start < $startCheck) { echo time(); echo ' '; diff --git a/erp24/controllers/ApiController.php b/erp24/controllers/ApiController.php index 6904286..fa9fac4 100644 --- a/erp24/controllers/ApiController.php +++ b/erp24/controllers/ApiController.php @@ -186,7 +186,10 @@ class ApiController extends Controller } $dataProvider = new ArrayDataProvider([ - 'allModels' => $entityArr + 'allModels' => $entityArr, + 'pagination' => [ + 'pageSize' => 2000, + ], ]); $columns = [