优化上游导出文件格式及时间问题

Application/Admin/Common/extend.php

@@ -2087,7 +2087,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
     $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']."\t");//银行账号
     $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行
 
-    $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$statement_begin_time}-{$statement_end_time}";
+    $fileName = "{$data['company_name']}&{$data['my_company']}-对账单{$statement_begin_time}-{$statement_end_time}";
 //    dd($fileName);
     ob_end_clean();//清除缓冲区,避免乱码
     header('pragma:public');

Application/Admin/Controller/CompanyStatementController.class.php

@@ -441,6 +441,11 @@ class CompanyStatementController extends ThinkController
             $data['receive_company']['invoice_type']="普票";
         }
         if ($data['company_belong'] == 9) {//上游
+            if($data['company_name'] == $data['first_party_info']['partner']){
+                $data['my_company'] = $data['second_party_info']['partner'];
+            }else{
+                $data['my_company'] = $data['first_party_info']['partner'];
+            }
             excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_sum_money);
         } else {
             //下游