From 97ada2d27fe15bccbc5345ad77f42f08ead19956 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 6 Dec 2024 14:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/export.go | 4 ----
 utils/export.go          | 8 +++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/api/controller/export.go b/api/controller/export.go
index aa41045..9a115da 100644
--- a/api/controller/export.go
+++ b/api/controller/export.go
@@ -1,7 +1,6 @@
 package controller
 
 import (
-	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/model"
@@ -475,9 +474,6 @@ func (r *Export) OrderProduct(c *gin.Context) {
 		return
 	}
 
-	jsonStr, err := json.Marshal(orderProducts)
-	utils.LogJsonInfo("打印", string(jsonStr))
-
 	// 业务处理
 	exportService := service.ExportService{}
 	ossAddress, err := exportService.OrderProduct(orderProducts)
diff --git a/utils/export.go b/utils/export.go
index dbf1cc9..299be6a 100644
--- a/utils/export.go
+++ b/utils/export.go
@@ -274,7 +274,13 @@ func fillDataWithMerge(f *excelize.File, sheetName string, header []HeaderCellDa
 			// 设置单元格样式
 			for i := 0; i < filedNumSlice; i++ {
 				axis = s + fmt.Sprintf("%d", row+i+1)
-				err := setCellStyle(f, sheetName, axis, header[row+i], alignment)
+
+				column, err := excelize.ColumnNameToNumber(s)
+				if err != nil {
+					return row, err
+				}
+
+				err = setCellStyle(f, sheetName, axis, header[column-1], alignment)
 				if err != nil {
 					return row, err
 				}