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();