修改二次推送及历史任务表格名称格式

src/history/util_history.go

@@ -1337,7 +1337,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 					log.Println("mkdir err", dir)
 				}
 			}
-			fname := t + ".xlsx"
+			//fname := t + ".xlsx"
+			fname := fmt.Sprintf("%s_%s.xlsx", fn, t)
 			err = xf.Save(dir + fname)
 			if err != nil {
 				log.Println("xls error", fname)

src/service/second_push.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"fmt"
 	"history"
 	"log"
 	"os"
@@ -410,7 +411,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -457,7 +458,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -523,7 +524,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -584,7 +585,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -652,7 +653,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -726,8 +727,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					log.Println("mkdir err", dir)
 				}
 			}
-			fname := t + ".xlsx"
-			//err = xf.Save(dir + fname)
+			fname := fmt.Sprintf("%s_%s.xlsx", fn, t)
 			err = newFile.Save(dir + fname)
 			if err != nil {
 				log.Println("xls error", fname)