Commit ea40b1d2 authored by hangjun83's avatar hangjun83

财务开票模块更新

parent 3f46d051
...@@ -808,7 +808,7 @@ class InvoiceService ...@@ -808,7 +808,7 @@ class InvoiceService
public function getInvoiceRecordList($requestParams) public function getInvoiceRecordList($requestParams)
{ {
$offset = !isset($requestParams['page_size']) || empty($requestParams['page_size']) ? 2000 : $requestParams['page_size']; $offset = !isset($requestParams['page_size']) || empty($requestParams['page_size']) ? 200 : $requestParams['page_size'];
if($offset > 200){ if($offset > 200){
$offset = 200; $offset = 200;
} }
...@@ -820,12 +820,12 @@ class InvoiceService ...@@ -820,12 +820,12 @@ class InvoiceService
$invocieTotal = 0; $invocieTotal = 0;
if($invoiceList){ if($invoiceList){
$invoiceList = app(InvoiceRecordTransformer::class)->transform($invoiceList); $invoiceList = app(InvoiceRecordTransformer::class)->transform($invoiceList);
$invocieTotal = $this->invoiceRecordRepository->count($where);
} }
$invocieTotal = $this->invoiceRecordRepository->count($where);
$dataReturn = []; $dataReturn = [];
$dataReturn['data'] = $invoiceList; $dataReturn['data'] = $invoiceList;
$dataReturn['total_page'] = ceil($invocieTotal / $offset); $dataReturn['total_page'] = ceil($invocieTotal / $offset) - 1;
$dataReturn['page_no'] = $pageNo; $dataReturn['page_no'] = $pageNo;
return $dataReturn; return $dataReturn;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment