From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据,智能匹配是用户没登录前也是获取发布需求最新数据,登录后会根据用户发布的需求,通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错

---
 admin/app/shop/service/order/ExportService.php |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/admin/app/shop/service/order/ExportService.php b/admin/app/shop/service/order/ExportService.php
index bdc51a1..097d9f2 100644
--- a/admin/app/shop/service/order/ExportService.php
+++ b/admin/app/shop/service/order/ExportService.php
@@ -576,36 +576,43 @@
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
-
+        $title = $list[0]['activity']['branch']['name'] . '-' . $list[0]['activity']['name'] . '-' . '活动报名记录表';
         //设置工作表标题名称
-        $sheet->setTitle('活动报名记录表');
+        $sheet->setTitle($title);
 
-        $sheet->setCellValue('A1', '用户id');
-        $sheet->setCellValue('B1', '昵称');
-        $sheet->setCellValue('C1', '姓名');
-        $sheet->setCellValue('D1', '手机号');
-        $sheet->setCellValue('E1', '报名状态');
-        $sheet->setCellValue('F1', '报名时间');
-        $sheet->setCellValue('G1', '活动ID');
-        $sheet->setCellValue('H1', '活动标题');
-
+        /*$sheet->setCellValue('A1', '用户id');
+        $sheet->setCellValue('B1', '昵称');*/
+        $sheet->setCellValue('A1', '姓名');
+        $sheet->setCellValue('B1', '手机号');
+        $sheet->setCellValue('C1', '邀请人');
+        $sheet->setCellValue('D1', '邀请人手机号');
+        $sheet->setCellValue('E1', '所属分会');/*
+        $sheet->setCellValue('F1', '报名状态');
+        $sheet->setCellValue('G1', '报名时间');
+        $sheet->setCellValue('H1', '活动ID');
+        $sheet->setCellValue('I1', '活动标题');*/
+        foreach(range('A','E') as $columnID) {
+            $sheet->getColumnDimension($columnID)->setAutoSize(true);
+        }
         //填充数据
         $index = 0;
         foreach ($list as $item) {
-            $sheet->setCellValue('A' . ($index + 2), $item['user_id']);
-            $sheet->setCellValue('B' . ($index + 2), $nickName);
-            $sheet->setCellValue('C' . ($index + 2), $item['real_name']);
-            $sheet->setCellValue('D' . ($index + 2), $item['mobile']);
-            $sheet->setCellValue('E' . ($index + 2), $item['status_text']);
-            $sheet->setCellValue('F' . ($index + 2), $item['create_time']);
-            $sheet->setCellValue('G' . ($index + 2), $item['activity_id']);
-            $sheet->setCellValue('H' . ($index + 2), $item['activity']['name']);
+            $sheet->setCellValue('A' . ($index + 2), $item['real_name']);
+            $sheet->setCellValueExplicit('B' . ($index + 2), $item['mobile'] , \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
+            $sheet->setCellValue('C' . ($index + 2), $item['recommend_name']);
+            $sheet->setCellValueExplicit('D' . ($index + 2), $item['recommend_mobile'] , \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
+
+            $sheet->setCellValue('E' . ($index + 2), empty($item['branch']) ? '无' : $item['branch']['name']);/*
+            $sheet->setCellValue('F' . ($index + 2), $item['status_text']);
+            $sheet->setCellValue('G' . ($index + 2), $item['create_time']);
+            $sheet->setCellValue('H' . ($index + 2), $item['activity_id']);
+            $sheet->setCellValue('I' . ($index + 2), $item['activity']['name']);*/
             $index++;
         }
 
         //保存文件
         $writer = new Xlsx($spreadsheet);
-        $filename = iconv("UTF-8", "GB2312//IGNORE", '活动报名记录表') . '-' . date('YmdHis') . '.xlsx';
+        $filename = iconv("UTF-8", "GB2312//IGNORE", $title) . '-' . date('YmdHis') . '.xlsx';
 
 
         header('Content-Type: application/vnd.ms-excel');

--
Gitblit v1.9.2