图表刷新

models/data_manage/chart_info.go

@@ -81,8 +81,8 @@ type ChartEdbInfoMapping struct {
 	UniqueCode          string      `gorm:"column:unique_code" description:"指标唯一编码"`
 	MinValue            float64     `gorm:"column:min_value" json:"-" description:"最小值"`
 	MaxValue            float64     `gorm:"column:max_value" json:"-" description:"最大值"`
-	DataList            interface{} `gorm:"column:data_list" description:"数据列表"`
-	IsNullData          bool        `gorm:"column:is_null_data" json:"-" description:"是否空数据"`
+	DataList            interface{} `gorm:"-" description:"数据列表"`
+	IsNullData          bool        `gorm:"-" json:"-" description:"是否空数据"`
 }
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {

models/data_manage/edb_info.go

@@ -3,6 +3,7 @@ package data_manage
 import (
 	"eta_gn/eta_chart_lib/global"
 	"eta_gn/eta_chart_lib/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -102,7 +103,7 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 	}
 	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetGormInReplace(num) + `) `
-	err = o.Raw(sql, edbInfoIdList).Scan(&items).Error
+	err = o.Raw(sql, edbInfoIdList).Find(&items).Error
 	return
 }
 
@@ -184,3 +185,24 @@ type TraceEdbInfoResp struct {
 	Child       []TraceEdbInfoResp `description:"下级来源"`
 	EdbInfo     *EdbInfo           `description:"指标信息" json:"-"`
 }
+
+func (e *EdbInfo) AfterFind(db *gorm.DB) (err error) {
+	tmpLatestDate, err := time.Parse(utils.FormatDateWallWithLoc, e.LatestDate)
+	if err != nil {
+		return nil
+	}
+	tmpStartDate, err := time.Parse(utils.FormatDateWallWithLoc, e.StartDate)
+	if err != nil {
+		return nil
+	}
+	tmpEndDate, err := time.Parse(utils.FormatDateWallWithLoc, e.EndDate)
+	if err != nil {
+		return nil
+	}
+
+	e.LatestDate = utils.TimeTransferString(utils.FormatDate, tmpLatestDate)
+	e.StartDate = utils.TimeTransferString(utils.FormatDate, tmpStartDate)
+	e.EndDate = utils.TimeTransferString(utils.FormatDate, tmpEndDate)
+
+	return nil
+}

models/data_manage/edb_info_calculate.go

@@ -20,7 +20,7 @@ func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error)
 	sql := ` SELECT b.* FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
-	err = o.Raw(sql, edbInfoId).Scan(&list).Error
+	err = o.Raw(sql, edbInfoId).Find(&list).Error
 	return
 }
 

services/data/edb_info.go

@@ -652,7 +652,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			sTime, tmpErr := time.Parse(utils.FormatDate, bv.StartDate)
 			if tmpErr != nil {
 				err = tmpErr
-				errmsg = err.Error()
+				errmsg = "时间格式转换失败1"
 				return
 			}
 			startDate = sTime.Format(utils.FormatDate)
@@ -660,7 +660,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			sTime, tmpErr := time.Parse(utils.FormatDate, bv.EndDate)
 			if tmpErr != nil {
 				err = tmpErr
-				errmsg = err.Error()
+				errmsg = "时间格式转换失败2"
 				return
 			}
 			frequency := bv.Frequency