fix

controllers/data_manage/edb_info.go

@@ -1901,7 +1901,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.Msg = "获取失败"
-				br.ErrMsg = "获取隆众资讯已存在信息失败,Err:" + err.Error()
+				br.ErrMsg = "获取泛糖科技已存在信息失败,Err:" + err.Error()
 				return
 			}
 
@@ -1910,7 +1910,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				minDate, maxDate, err := data_manage.GetEdbDataHisugarMaxOrMinDate(edbCode)
 				if err != nil {
 					br.Msg = "获取失败"
-					br.ErrMsg = "获取上期所日期信息失败,Err:" + err.Error()
+					br.ErrMsg = "获取泛糖科技日期信息失败,Err:" + err.Error()
 					return
 				}
 				searchItem.DataList = dataItems

controllers/hisugar_data.go

@@ -173,7 +173,6 @@ func (this *TradeCommonController) HisugarData() {
 	condition += ` AND index_code =? `
 	pars = append(pars, indexCode)
 
-
 	index, err := data_manage.GetHisugarIndexByCode(indexCode)
 	if err != nil {
 		br.Msg = "获取数据失败"
@@ -190,7 +189,6 @@ func (this *TradeCommonController) HisugarData() {
 
 	resp := data_manage.BaseFromHisugarIndexList{}
 
-
 	resp.BaseFromHisugarIndexId = index.BaseFromHisugarIndexId
 	resp.ClassifyId = index.ClassifyId
 	resp.IndexCode = index.IndexCode
@@ -203,7 +201,6 @@ func (this *TradeCommonController) HisugarData() {
 	total, err := data_manage.GetHisugarDataListCount(condition, pars)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
-
 	if len(dataList) > 0 {
 		resp.ModifyTime = dataList[0].ModifyTime
 	}
@@ -696,6 +693,15 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 		utils.FileLog.Info("GetSciFrequency err:" + err.Error())
 		return
 	}
+	frequencyMap := map[string]string{
+		"日度":  "Daily",
+		"周度":  "Weekly",
+		"旬度":  "ten-day",
+		"月度":  "Monthly",
+		"季度":  "Quarterly",
+		"半年度": "Semi-annual",
+		"年度":  "Annual",
+	}
 	for _, frequency := range frequencies {
 		//获取指标
 		secNameList, err = data_manage.GetHisugarIndexByConditionAndFrequency(condition, *frequency, pars)
@@ -708,7 +714,7 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 			return
 		}
 
-		sheetNew, err := xlsxFile.AddSheet(*frequency)
+		sheetNew, err := xlsxFile.AddSheet(*frequency+frequencyMap[*frequency])
 		if err != nil {
 			fmt.Println("新增Sheet失败", err.Error())
 			return
@@ -841,7 +847,6 @@ func getHisugarClassifyTree(items []*data_manage.BaseFromHisugarClassifyItem, pa
 	return res
 }
 
-
 // FenweiIndexData
 // @Title 获取数据
 // @Description 获取泛糖科技数据接口
@@ -1031,4 +1036,4 @@ func (this *TradeCommonController) GetHisugarIndexInfo() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = indexInfoPage
-}
+}