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 }