From 0b4e3a3f31881bf62aebdd869852661264dbeca3 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 5 Aug 2025 15:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CustomerController.php         |  5 +++--
 app/crmAdmin/service/CustomerService.php      | 22 +++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/crmAdmin/controller/CustomerController.php b/app/crmAdmin/controller/CustomerController.php
index 4b46fc9..ba2d213 100644
--- a/app/crmAdmin/controller/CustomerController.php
+++ b/app/crmAdmin/controller/CustomerController.php
@@ -44,13 +44,14 @@ class CustomerController extends BaseController
      */
     public function export(Request $request)
     {
-        set_time_limit(120);
+        set_time_limit(300);
         try {
             $param = $request->all();
 //            $corp = Corp::where(['abbr' => $request->basic_data['corp_abbr']])->first();
 //            $param['corp_abbr'] = $corp->id;
 
-            $excelContent = (new CustomerService())->export($param);
+            $result = (new CustomerService())->export($param);
+            $excelContent = file_get_contents($result['filepath']);
             // 生成文件名
             $filename = '客户数据_' . date('Y-m-d_H-i-s') . '.xlsx';
             return response()
diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php
index 5ea6c8f..17ae60f 100644
--- a/app/crmAdmin/service/CustomerService.php
+++ b/app/crmAdmin/service/CustomerService.php
@@ -248,18 +248,18 @@ class CustomerService
 
         // 创建Excel写入器
         $writer = new Xlsx($spreadsheet);
-//        $writer->save($filepath);
-        $writer->save('php://output');
-        $excelContent = ob_get_clean();
-        return $excelContent;
+        $writer->save($filepath);
+//        $writer->save('php://output');
+//        $excelContent = ob_get_clean();
+//        return $excelContent;
 
-        // 返回文件信息
-//        return [
-//            'filename' => $filename,
-//            'filepath' => $filepath,
-//            'size' => filesize($filepath),
-//            'count' => count($customers)
-//        ];
+//         返回文件信息
+        return [
+            'filename' => $filename,
+            'filepath' => $filepath,
+            'size' => filesize($filepath),
+            'count' => count($customers)
+        ];
     }
 
     /**