Merge branch 'wp'
This commit is contained in:
commit
62035acff6
@ -41,7 +41,7 @@ func DealExcelImg(filePath string) (err error) {
|
|||||||
firstCellName = string(firstCell)
|
firstCellName = string(firstCell)
|
||||||
}
|
}
|
||||||
columnFullName = fmt.Sprintf("%s%s", firstCellName, columnName)
|
columnFullName = fmt.Sprintf("%s%s", firstCellName, columnName)
|
||||||
if strings.Contains(colCell, "cdns.fontree.cn") {
|
if strings.Contains(colCell, "e-cdn.fontree.cn") {
|
||||||
suffix = colCell[strings.LastIndex(colCell, "."):]
|
suffix = colCell[strings.LastIndex(colCell, "."):]
|
||||||
if strings.Contains(".jpg,.png,.gif,.bmp,.jpeg,", suffix) {
|
if strings.Contains(".jpg,.png,.gif,.bmp,.jpeg,", suffix) {
|
||||||
cellNo = fmt.Sprintf("%s%v", columnFullName, lineNo)
|
cellNo = fmt.Sprintf("%s%v", columnFullName, lineNo)
|
||||||
|
@ -159,7 +159,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("20060102"))
|
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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user