|
|
@@ -382,9 +382,21 @@ func GetRangeAnalysisChartDataByEdbInfo(to orm.TxOrmer, fromEdbInfo *EdbInfo, ca
|
|
|
edbEndDate := edbEndDateTime.AddDate(0, 0, 1).Format(utils.FormatDate)
|
|
|
|
|
|
// 获取时间基准指标在时间区间内的值
|
|
|
- dataList, err := GetEdbDataListAllByTo(to, fromEdbInfo.Source, fromEdbInfo.SubSource, FindEdbDataListAllCond{
|
|
|
- EdbInfoId: fromEdbInfo.EdbInfoId,
|
|
|
- }, 0)
|
|
|
+ dataList := make([]*EdbInfoSearchData, 0)
|
|
|
+ switch fromEdbInfo.EdbInfoType {
|
|
|
+ case 0:
|
|
|
+ //获取来源指标的数据
|
|
|
+ dataList, err = GetEdbDataListAll(fromEdbInfo.Source, fromEdbInfo.SubSource,
|
|
|
+ FindEdbDataListAllCond{
|
|
|
+ EdbInfoId: fromEdbInfo.EdbInfoId,
|
|
|
+ }, 0)
|
|
|
+ case 1:
|
|
|
+ dataList, err = GetPredictEdbDataListAllByStartDate(fromEdbInfo, 0, "")
|
|
|
+ default:
|
|
|
+ err = errors.New(fmt.Sprint("获取失败,指标base类型异常", fromEdbInfo.EdbInfoType))
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
if err != nil {
|
|
|
err = fmt.Errorf("获取时间基准指标在时间区间内的值失败,Err:" + err.Error())
|
|
|
return
|
