From 79588d52e8dc09ded6020c161b9c20e8de1d82ee Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 22 Dec 2020 13:47:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1=E6=B1=87?= =?UTF-8?q?=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index faec62a22..c389f9d8a 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -498,7 +498,6 @@ class CompanyStatementPoolController extends ThinkController $v['statement_money'] = "=ROUND("; } $handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line); -// dump($handle_data); $v['statement_info'] = $handle_data; $row = 0; foreach($v['statement_info'] as $ke=>&$va){ @@ -523,13 +522,9 @@ class CompanyStatementPoolController extends ThinkController } //本周未结算流水合计 if(!$is_statement){ - $count['pool_lack_count'] += $val['pay_amount']; - $count['st_lack_count'] += $val['sum_money']; if($is_export){ $this->setlackCount($line); } - }else{ - $count['st_count'] += $val['sum_money']; } } @@ -547,6 +542,12 @@ class CompanyStatementPoolController extends ThinkController } $count['week_money'] += $va['week_amount']; $count['sum_money'] += $va['week_amount']; + if(!$is_statement){ + $count['pool_lack_count'] += $va['week_amount']; + $count['st_lack_count'] += $va['week_amount']; + }else{ + $count['st_count'] += $va['week_amount']; + } } $v['row'] = $row;