From f72bb66356df719f0c1a0b6c3af19d8c8c9d5885 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 10 Oct 2020 10:14:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=85=AC=E5=BC=8F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AggregateFinanceStatementController.class.php | 10 ++++++++-- .../AggregateStatementPoolController.class.php | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 0de95aaf0..275a1e453 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -670,6 +670,8 @@ class AggregateFinanceStatementController extends ThinkController $objPHPExcel->getActiveSheet()->setCellValue('D2','补点比例'); } $line = 3; + $pay_amount_str = "=SUM(F3:"; + $plat_amount_str = "=SUM(C3:"; foreach ($data['statement_info'] as $key => $value) { $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1); $objPHPExcel->getActiveSheet()->removeConditionalStyles(); @@ -690,8 +692,12 @@ class AggregateFinanceStatementController extends ThinkController $objPHPExcel->getActiveSheet()->getStyle('F'.$line)->getFont()->setBold(false); $line++; } - $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $data['pay_money']);//合计-平台总额 - $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $data['ratio_money']);//合计-结算金额 + + $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $plat_amount_str."C".($line-1).")");//合计-平台总额 + $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $pay_amount_str."F".($line-1).")");//合计-结算金额 + +// $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $data['pay_money']);//合计-平台总额 +// $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $data['ratio_money']);//合计-结算金额 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+1), $big_all_sum_money);//大写支付结算金额 //甲方信息 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+3), $data['first_party_info']['partner']);//甲方 diff --git a/Application/Admin/Controller/AggregateStatementPoolController.class.php b/Application/Admin/Controller/AggregateStatementPoolController.class.php index bc92958b6..ce1ad8a5a 100644 --- a/Application/Admin/Controller/AggregateStatementPoolController.class.php +++ b/Application/Admin/Controller/AggregateStatementPoolController.class.php @@ -261,8 +261,8 @@ class AggregateStatementPoolController extends ThinkController $v['statement_count'] = count($v['statement_info']); } if($is_export){ - $count["platform_amount"] = "=SUM(G2:G".$line.")"; - $count["sum_money"] = "=SUM(L2:L".$line.")"; + $count["platform_amount"] = "=ROUND(SUM(G2:G".$line."),2)"; + $count["sum_money"] = "=ROUND(SUM(L2:L".$line."),2)"; } $this->assign("data",$infolist); From b92ce713b31b50daac9a15a42dcf1bcc13e6e5ec Mon Sep 17 00:00:00 2001 From: zyx Date: Sat, 10 Oct 2020 20:04:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=81=9A=E5=90=88=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...regateFinanceStatementController.class.php | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 275a1e453..bec865ff8 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -644,7 +644,30 @@ class AggregateFinanceStatementController extends ThinkController $data['pay_company'] = $data['first_party_info']; } $this->doAddOperationLog($id,"导出"); - $this->excelDownStreamTemplate($data,$big_pay_money); + $relation = M("company_relation","tab_")->where("(first_company_id={$data['channel_id']} and first_company_type=3) or (second_company_id = {$data['channel_id']} and second_company_type=3)")->find(); + + $company_type = 0; + $company_info = []; + + if ($relation['first_company_type'] == 3) { + $company_info = json_decode($relation['first_company_info'],true); + } elseif($relation['second_company_type'] == 3) { + $company_info = json_decode($relation['second_company_info'],true); + } + + if ($company_info['company_type']=='个人') { + $company_type = 1; + } elseif($company_info['company_type']=='公司') { + $company_type = 2; + } + + if ($company_type == 1) { + $this->excelDownStreamPersonTemplate($data,$big_pay_money); + } else { + $this->excelDownStreamTemplate($data,$big_pay_money); + } + + } public function excelDownStreamTemplate($data,$big_all_sum_money) { From 3db4fe1f60aba92dbf57d065d86f460133a67167 Mon Sep 17 00:00:00 2001 From: zyx Date: Sat, 10 Oct 2020 20:24:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=81=9A=E5=90=88=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E4=B8=AA=E4=BA=BA=E4=B8=8E=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=AF=BC=E5=87=BA=E4=B8=8D=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ggregateFinanceStatementController.class.php | 2 +- Public/Admin/excel/aggregate_person_stream.xls | Bin 0 -> 23552 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Public/Admin/excel/aggregate_person_stream.xls diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index bec865ff8..1d1d73bfd 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -780,7 +780,7 @@ class AggregateFinanceStatementController extends ThinkController $objPHPExcel = new \PHPExcel(); $objReader = \PHPExcel_IOFactory::createReader('Excel5'); //设置模板文件 - $objPHPExcel = $objReader->load("Public/Admin/excel/aggregate_stream.xls"); + $objPHPExcel = $objReader->load("Public/Admin/excel/aggregate_person_stream.xls"); $statement_begin_time = date('Y.m.d', $data['begintime']);//对账开始时间 $statement_end_time = date('Y.m.d',$data['endtime']);//对账截止时间 diff --git a/Public/Admin/excel/aggregate_person_stream.xls b/Public/Admin/excel/aggregate_person_stream.xls new file mode 100644 index 0000000000000000000000000000000000000000..0964e3591c502d4c1533116496b6e36141326aac GIT binary patch literal 23552 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 s3g?l)ISig~@Q=zI