Roc 2 months ago
parent
commit
08369a09b3

+ 6 - 1
controllers/data_manage/base_from_rzd_index_controller.go

@@ -600,7 +600,12 @@ func (this *BaseFromRzdIndexController) RzdIndexDataExport() {
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
-		for _, dataTime := range dataTimeList {
+		dataTimeStrList := make([]string, 0)
+		for _, v := range dataTimeList {
+			dataTimeStrList = append(dataTimeStrList, v.Format(utils.FormatDate))
+		}
+
+		for _, dataTime := range dataTimeStrList {
 			rowData := sheet.AddRow()
 			celDate := rowData.AddCell()
 			celDate.SetValue(dataTime)

+ 6 - 2
controllers/hisugar_data.go

@@ -741,10 +741,14 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 			fmt.Println("获取数据时间失败", err.Error())
 			return
 		}
+		dataTimeStrList := make([]string, 0)
+		for _, v := range dataTimeList {
+			dataTimeStrList = append(dataTimeStrList, v.Format(utils.FormatDate))
+		}
 
 		// 添加excel左侧指标日期
 		setRowIndex := 4
-		for rk, dv := range dataTimeList {
+		for rk, dv := range dataTimeStrList {
 			rowIndex := setRowIndex + rk
 			row := sheetNew.Row(rowIndex)
 			displayDate, _ := time.Parse(utils.FormatDate, dv)
@@ -785,7 +789,7 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 				dataInfoMap[v.DataTime] = v
 			}
 
-			for rk, dtv := range dataTimeList {
+			for rk, dtv := range dataTimeStrList {
 				rowIndex := setRowIndex + rk
 				row := sheetNew.Row(rowIndex)
 				displayDateCell := row.AddCell()

+ 1 - 1
models/data_manage/base_from_hisugar.go

@@ -366,7 +366,7 @@ func GetHisugarDataViewList(indexIds []int) (items []*BaseFromHisugarDataItem, e
 }
 
 // GetHisugarDataDataTimeByIndexId 根据指标id获取指标数据的日期列表
-func GetHisugarDataDataTimeByIndexId(indexIdList []int) (items []string, err error) {
+func GetHisugarDataDataTimeByIndexId(indexIdList []int) (items []time.Time, err error) {
 	if len(indexIdList) == 0 {
 		return
 	}

+ 1 - 1
models/data_manage/base_from_rzd_data.go

@@ -137,7 +137,7 @@ func GetBaseFormRzdDataByCondition(condition string, pars interface{}) (items []
 }
 
 // GetRzdDataListByIndexCodes 根据指标编码查询
-func GetRzdDataListByIndexCodes(IndexCodes string) (items []string, err error) {
+func GetRzdDataListByIndexCodes(IndexCodes string) (items []time.Time, err error) {
 	sql := ` SELECT data_time FROM base_from_rzd_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time ORDER BY data_time DESC `
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql).QueryRows(&items)