From b39efb2d18d03bcd34285d1d2decd7e40030184e Mon Sep 17 00:00:00 2001 From: zyx Date: Mon, 28 Oct 2019 17:30:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 6 ++++++ Application/Admin/Model/SpendModel.class.php | 1 + 2 files changed, 7 insertions(+) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 8a3db8bf7..3b4576491 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -164,6 +164,12 @@ class FinanceController extends ThinkController $sum = D('spend')->sumSpend($map,'pay_amount'); + $count = D("spend")->getSpendData($map,$field,$group,$order); + + $count = count($count); + $page = set_pagination($count,$row); + if($page) {$this->assign('_page', $page);} + $this->assign('data',$data); $this->assign('sum_amount',$sum); diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index f80edb062..775981c5e 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -755,6 +755,7 @@ protected function _after_select(&$result,$options){ public function sumSpend($map=[],$field='') { $sum = $this->where($map)->sum($field); + return $sum; }