|
|
@@ -79,6 +79,9 @@ type EdbInfoCalculateDetail struct {
|
|
|
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) {
|
|
|
@@ -91,7 +94,7 @@ func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateD
|
|
|
//
|
|
|
//sql = fmt.Sprintf(sql, calculateTableName)
|
|
|
|
|
|
- sql := ` SELECT a.edb_info_calculate_mapping_id,a.edb_info_id,a.source,a.source_name,a.edb_code,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,a.move_value,b.edb_name_source as from_edb_name,b.start_date,b.end_date,b.latest_date,b.latest_value,b.edb_type FROM edb_info_calculate_mapping AS a
|
|
|
+ sql := ` SELECT a.edb_info_calculate_mapping_id,a.edb_info_id,a.source,a.source_name,a.edb_code,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,a.move_value,b.edb_name_source as from_edb_name,b.start_date,b.end_date,b.latest_date,b.latest_value,b.edb_type, b.frequency, b.unit, b.classify_id 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 `
|
|
|
|
|
|
@@ -548,6 +551,8 @@ type BatchEdbInfoCalculateBatchSaveReq struct {
|
|
|
MoveFrequency string `description:"移动频度:天/周/月/季/年"`
|
|
|
Calendar string `description:"公历/农历"`
|
|
|
Data interface{} `description:"数据"`
|
|
|
+ EmptyType int `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
|
|
|
+ MaxEmptyType int `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
|
|
|
Extra string `description:"指标的额外配置"`
|
|
|
}
|
|
|
|
