Prechádzať zdrojové kódy

fix: 日期格式问题

hsun 3 rokov pred
rodič
commit
fdceb2b340

+ 0 - 3
controller/chart/chart_info.go

@@ -270,9 +270,6 @@ func GetChartInfoDetail(c *gin.Context)  {
 				quarterMap := make(map[int][]*edbDataModel.EdbDataList)
 				var quarterArr []int
 				for _, v := range dataList {
-					if v.DataTime != "" {
-						v.DataTime = v.DataTime[:10]
-					}
 					itemDate, err := time.Parse(utils.FormatDate, v.DataTime)
 					if err != nil {
 						response.FailMsg("获取失败", "季度指标日期转换失败, Err:" + err.Error() + ";DataTime:" + v.DataTime, c)

+ 9 - 0
models/tables/edb_data/query.go

@@ -112,6 +112,15 @@ func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*E
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
 	err = global.MYSQL["data"].Raw(sql, pars...).Scan(&list).Error
+	// 格式化日期
+	if len(list) > 0 {
+		for _, row := range list {
+			if row.DataTime != "" {
+				tempTime, _ := time.Parse("2006-01-02T00:00:00", row.DataTime)
+				row.DataTime = tempTime.Format(utils.FormatDate)
+			}
+		}
+	}
 
 	return
 }

+ 0 - 3
services/edb_data/edb_data.go

@@ -19,7 +19,6 @@ func AddCalculateQuarter(dataList []*edbDataModel.EdbDataList) (result *edbDataM
 	}()
 
 	endDate := dataList[len(dataList)-1].DataTime
-	endDate = endDate[:10]
 	endDateForm, err := time.Parse(utils.FormatDate, endDate)
 	if err != nil {
 		return result, err
@@ -32,7 +31,6 @@ func AddCalculateQuarter(dataList []*edbDataModel.EdbDataList) (result *edbDataM
 	var cureentDate time.Time
 	if thisMonth < 11 {
 		for k, v := range dataList {
-			v.DataTime = v.DataTime[:10]
 			dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
 			if err != nil {
 				errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
@@ -49,7 +47,6 @@ func AddCalculateQuarter(dataList []*edbDataModel.EdbDataList) (result *edbDataM
 		}
 	} else {
 		for k, v := range dataList {
-			v.DataTime = v.DataTime[:10]
 			dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
 			if err != nil {
 				errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime