Browse Source

修改bug

yjp 2 months ago
parent
commit
3d72d8acac
1 changed files with 18 additions and 4 deletions
  1. 18 4
      excelutils/excelutils.go

+ 18 - 4
excelutils/excelutils.go

@@ -1,6 +1,7 @@
 package excelutils
 
 import (
+	"bytes"
 	"fmt"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"github.com/xuri/excelize/v2"
@@ -9,7 +10,7 @@ import (
 	"strconv"
 )
 
-func ExportExcel(titleList []string, data []interface{}, sheetName string) (*excelize.File, error) {
+func ExportExcel(titleList []string, data []interface{}, sheetName string) ([]byte, error) {
 	f := excelize.NewFile()
 	defer func() {
 		err := f.Close()
@@ -40,8 +41,15 @@ func ExportExcel(titleList []string, data []interface{}, sheetName string) (*exc
 		},
 	})
 
-	_ = f.SetSheetRow(sheetName, "A1", &header)
-	_ = f.SetRowHeight(sheetName, 1, 30)
+	err = f.SetSheetRow(sheetName, "A1", &header)
+	if err != nil {
+		return nil, err
+	}
+
+	err = f.SetRowHeight(sheetName, 1, 30)
+	if err != nil {
+		return nil, err
+	}
 
 	length := len(titleList)
 	headStyle := strutils.GenerateUpperLetters(length)
@@ -78,5 +86,11 @@ func ExportExcel(titleList []string, data []interface{}, sheetName string) (*exc
 		}
 	}
 
-	return f, nil
+	buffer := &bytes.Buffer{}
+	err = f.Write(buffer)
+	if err != nil {
+		return nil, err
+	}
+
+	return buffer.Bytes(), nil
 }