From 546abbfa72226fa2f75e6f79b0213c72e38e0410 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 29 Jun 2021 13:46:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A5=96=E9=87=91=E6=B1=A0?= =?UTF-8?q?=E6=80=BB=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessAffairsAwardController.class.php | 12 ++++++++---- .../BusinessAffairsAward/businessAffairsList.html | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/BusinessAffairsAwardController.class.php b/Application/Admin/Controller/BusinessAffairsAwardController.class.php index 0a27ca80a..067ef2d3a 100644 --- a/Application/Admin/Controller/BusinessAffairsAwardController.class.php +++ b/Application/Admin/Controller/BusinessAffairsAwardController.class.php @@ -189,13 +189,13 @@ class BusinessAffairsAwardController extends ThinkController $map['verify_status'] = ['like',"%{$_REQUEST['verify_status']}%"]; } - $data = M("business_affairs_award_pool","tab_") + $query = M("business_affairs_award_pool","tab_") ->where($map); if (!$_REQUEST['export']) { - $data->page($page, $row); + $query->page($page, $row); } - $data = $data->order("time desc")->select(); + $data = $query->order("time desc")->select(); foreach ($data as $key => $value) { @@ -246,6 +246,10 @@ class BusinessAffairsAwardController extends ThinkController $count = M("business_affairs_award_pool","tab_") ->where($map) ->count(); + + $gameBonusPool = M("business_affairs_award_pool","tab_") + ->where($map) + ->sum('game_bonus_pool'); if(IS_ROOT){ $this->assign('verify_check',true); @@ -264,7 +268,7 @@ class BusinessAffairsAwardController extends ThinkController } $this->assign("list",$data); - + $this->assign("gameBonusPool", round(floatval($gameBonusPool), 2)); $this->display(); } diff --git a/Application/Admin/View/BusinessAffairsAward/businessAffairsList.html b/Application/Admin/View/BusinessAffairsAward/businessAffairsList.html index d587272f9..698046a64 100644 --- a/Application/Admin/View/BusinessAffairsAward/businessAffairsList.html +++ b/Application/Admin/View/BusinessAffairsAward/businessAffairsList.html @@ -215,6 +215,9 @@ +