Merge branch '10.6' into debug

# Conflicts:
#	utils/constants.go

services/data/edb_info.go

@@ -194,13 +194,13 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error)
 
 		result, err := RefreshPredictEdbCalculateData(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 		if err != nil {
-			fmt.Println(v, "RefreshEdbCalculateData err", time.Now())
-			errmsg = "RefreshEdbCalculateData Err:" + err.Error()
+			fmt.Println(v, "RefreshPredictEdbCalculateData err", time.Now())
+			errmsg = "RefreshPredictEdbCalculateData Err:" + err.Error()
 			return err
 		}
 		if result.Ret != 200 {
-			fmt.Println(v, "RefreshEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
-			errmsg = fmt.Sprint(v, "RefreshEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
+			fmt.Println(v, "RefreshPredictEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
+			errmsg = fmt.Sprint(v, "RefreshPredictEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
 			return fmt.Errorf("刷新失败")
 		}
 	}

services/data/predict_edb_info.go

@@ -97,6 +97,9 @@ func GetPredictDataListByPredictEdbInfoId(edbInfoId int, startDate, endDate stri
 func GetPredictDataListByPredictEdbInfo(edbInfo *data_manage.EdbInfo, startDate, endDate string, isTimeBetween bool) (dataList []*models.EdbDataList, sourceEdbInfoItem *data_manage.EdbInfo, predictEdbConf *data_manage.PredictEdbConf, err error, errMsg string) {
 	// 非计算指标，直接从表里获取数据
 	if edbInfo.EdbType != 1 {
+		if !isTimeBetween {
+			endDate = ``
+		}
 		return GetPredictCalculateDataListByPredictEdbInfo(edbInfo, startDate, endDate)
 	}
 	// 查找该预测指标配置