From 54a52e68d8eb1fe053f127b58d267605cc9ddefc Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Fri, 12 Aug 2022 18:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E8=AF=AD=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/service/curd/templates/controller/exportMethod.code | 2 +-
 app/admin/traits/Curd.php                                     | 2 +-
 app/common/tools/{ExcelTools.php => ExportTools.php}          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename app/common/tools/{ExcelTools.php => ExportTools.php} (95%)

diff --git a/app/admin/service/curd/templates/controller/exportMethod.code b/app/admin/service/curd/templates/controller/exportMethod.code
index e0cf6ca..25cf41e 100644
--- a/app/admin/service/curd/templates/controller/exportMethod.code
+++ b/app/admin/service/curd/templates/controller/exportMethod.code
@@ -19,7 +19,7 @@
         $select_fields = json_decode($select_fields, true);
         $date_fields = json_decode($date_fields, true);
 
-        $content = \app\common\tools\ExcelTools::exportModel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
+        $content = \app\common\tools\ExportTools::excel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
 
         return download($content, $this->model->getName() . date('YmdHis') . '.xlsx', true);
     }
\ No newline at end of file
diff --git a/app/admin/traits/Curd.php b/app/admin/traits/Curd.php
index 80f6bd5..86af9d0 100644
--- a/app/admin/traits/Curd.php
+++ b/app/admin/traits/Curd.php
@@ -118,7 +118,7 @@ trait Curd
         $select_fields = json_decode($select_fields, true);
         $date_fields = json_decode($date_fields, true);
 
-        $content = \app\common\tools\ExcelTools::exportModel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
+        $content = \app\common\tools\ExportTools::excel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
 
         return download($content, $this->model->getName() . date('YmdHis') . '.xlsx', true);
     }
diff --git a/app/common/tools/ExcelTools.php b/app/common/tools/ExportTools.php
similarity index 95%
rename from app/common/tools/ExcelTools.php
rename to app/common/tools/ExportTools.php
index c392509..90a6bac 100644
--- a/app/common/tools/ExcelTools.php
+++ b/app/common/tools/ExportTools.php
@@ -4,9 +4,9 @@ namespace app\common\tools;
 
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 
-class ExcelTools
+class ExportTools
 {
-    public static function exportModel($model, $where = [], $fields = [], $image_fields = [], $select_fields = [], $date_fields = [])
+    public static function excel($model, $where = [], $fields = [], $image_fields = [], $select_fields = [], $date_fields = [])
     {
 
         $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();