|
@@ -50,29 +50,29 @@ type FromEdbInfoData struct {
|
|
|
}
|
|
|
|
|
|
type EdbInfoCalculateDetail struct {
|
|
|
- EdbInfoCalculateId int `orm:"column(edb_info_calculate_id);pk" gorm:"primaryKey" `
|
|
|
- EdbInfoId int `description:"指标id"`
|
|
|
- EdbCode string `description:"指标编码"`
|
|
|
- FromEdbInfoId int `description:"计算指标id"`
|
|
|
- FromEdbCode string `description:"计算指标编码"`
|
|
|
- FromEdbName string `description:"计算指标名称"`
|
|
|
- FromEdbNameEn string `description:"计算指标名称"`
|
|
|
- FromSource int `description:"计算指标来源"`
|
|
|
- FromSourceName string `description:"计算指标来源名称"`
|
|
|
- FromTag string `description:"来源指标标签"`
|
|
|
- MoveValue int `description:"移动的值,小于0是提前,0是不变,大于0是滞后"`
|
|
|
- Sort int `description:"计算指标名称排序"`
|
|
|
- CreateTime time.Time `description:"创建时间"`
|
|
|
- ModifyTime time.Time `description:"修改时间"`
|
|
|
- StartDate string `description:"开始日期"`
|
|
|
- EndDate string `description:"结束日期"`
|
|
|
- LatestDate string `description:"实际的结束日期"`
|
|
|
- LatestValue float64 `description:"最近实际数据的值"`
|
|
|
- EndValue float64 `description:"结束日期的值(可能是插入值)"`
|
|
|
- EdbType int `description:"指标类型:1:基础指标,2:计算指标"`
|
|
|
- Frequency string `description:"频率"`
|
|
|
- Unit string `description:"单位"`
|
|
|
- ClassifyId int `description:"分类id"`
|
|
|
+ EdbInfoCalculateId int `orm:"column(edb_info_calculate_id);pk" gorm:"primaryKey" `
|
|
|
+ EdbInfoId int `description:"指标id"`
|
|
|
+ EdbCode string `description:"指标编码"`
|
|
|
+ FromEdbInfoId int `description:"计算指标id"`
|
|
|
+ FromEdbCode string `description:"计算指标编码"`
|
|
|
+ FromEdbName string `description:"计算指标名称"`
|
|
|
+ FromEdbNameEn string `description:"计算指标名称"`
|
|
|
+ FromSource int `description:"计算指标来源"`
|
|
|
+ FromSourceName string `description:"计算指标来源名称"`
|
|
|
+ FromTag string `description:"来源指标标签"`
|
|
|
+ MoveValue int `description:"移动的值,小于0是提前,0是不变,大于0是滞后"`
|
|
|
+ Sort int `description:"计算指标名称排序"`
|
|
|
+ CreateTime string `description:"创建时间"`
|
|
|
+ ModifyTime string `description:"修改时间"`
|
|
|
+ StartDate string `description:"开始日期"`
|
|
|
+ EndDate string `description:"结束日期"`
|
|
|
+ LatestDate string `description:"实际的结束日期"`
|
|
|
+ LatestValue float64 `description:"最近实际数据的值"`
|
|
|
+ EndValue float64 `description:"结束日期的值(可能是插入值)"`
|
|
|
+ EdbType int `description:"指标类型:1:基础指标,2:计算指标"`
|
|
|
+ Frequency string `description:"频率"`
|
|
|
+ Unit string `description:"单位"`
|
|
|
+ ClassifyId int `description:"分类id"`
|
|
|
}
|
|
|
|
|
|
func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateDetail, err error) {
|
|
@@ -88,6 +88,13 @@ func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateD
|
|
|
WHERE a.edb_info_id=? ORDER BY sort ASC `
|
|
|
|
|
|
err = global.DmSQL["data"].Raw(sql, edbInfoId).Scan(&list).Error
|
|
|
+ if err != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range list {
|
|
|
+ v.ConvertToResp()
|
|
|
+ }
|
|
|
|
|
|
return
|
|
|
}
|
|
@@ -350,5 +357,8 @@ func (m *EdbInfoCalculateDetail) ConvertToResp() {
|
|
|
m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
|
|
|
m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
|
|
|
m.LatestDate = utils.GormDateStrToDateStr(m.LatestDate)
|
|
|
+ m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
|
|
|
+ m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
|
|
|
+
|
|
|
return
|
|
|
}
|