Merge branch 'wp' into dev

This commit is contained in:
workabee 2024-02-22 12:42:03 +08:00
commit 7c953d6a7b

View File

@ -147,7 +147,7 @@ func ExportRegister(c *gin.Context) {
resp.Data = []*exhibition.ExportInfo{} resp.Data = []*exhibition.ExportInfo{}
} }
columns := []string{"画家姓名", "性别", "手机号", "身份证号", "通讯地址", "身份证照片", "本人近照", "报名时间", "更新时间"} columns := []string{"画家姓名", "性别", "手机号", "身份证号", "通讯地址", "身份证照片", "本人近照", "报名时间", "更新时间"}
exportFileName := fmt.Sprintf("国展报名%s.xlsx", time.Now().Format("20060101")) exportFileName := fmt.Sprintf("国展报名%s.xlsx", time.Now().Format("20060102"))
filePath := fmt.Sprintf("./runtime/%s", exportFileName) filePath := fmt.Sprintf("./runtime/%s", exportFileName)
data := make([]interface{}, 0) data := make([]interface{}, 0)
for _, v := range resp.Data { for _, v := range resp.Data {
@ -184,7 +184,6 @@ func ExportRegister(c *gin.Context) {
} }
var exportUrl string var exportUrl string
exportUrl = fmt.Sprintf("%s%s/static/%s", httpType, c.Request.Host, exportFileName) exportUrl = fmt.Sprintf("%s%s/static/%s", httpType, c.Request.Host, exportFileName)
response.ResponseQuickMsg(c, msg.Ok, resp.Msg, map[string]string{ response.ResponseQuickMsg(c, msg.Ok, resp.Msg, map[string]string{
"exportUrl": exportUrl, "exportUrl": exportUrl,
}) })