Merge remote-tracking branch 'origin/chart/13.0' into debug

# Conflicts:
#	controllers/base_from_predict_calculate.go

controllers/base_from_predict_calculate.go

@@ -565,8 +565,8 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 
 	// 来源预测指标信息
 	var fromEdbInfo *models.EdbInfo
-	if req.FromEdbInfoId > 0 {
-		fromEdbInfo, err = models.GetEdbInfoById(req.FromEdbInfoId)
+	if fromEdbInfoId > 0 {
+		fromEdbInfo, err = models.GetEdbInfoById(fromEdbInfoId)
 		if err != nil {
 			br.Msg = "获取指标信息失败"
 			br.ErrMsg = "获取指标信息失败:Err:" + err.Error()
@@ -594,9 +594,6 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 	var latestDateStr string // 最近实际数据的日期
 	var latestValue float64  // 最近实际数据的值
 
-	// 基础指标id
-	fromEdbInfoId := req.FromEdbInfoId
-
 	var formulaInt int
 	var nhccDate models.NhccDate // 拟合残差的日期
 	switch req.Source {
@@ -611,13 +608,13 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 			return
 		}
 	/*case utils.DATA_SOURCE_PREDICT_CALCULATE_ZJPJ:
-		//直接拼接指标
-		//校验时间格式
-		_, err = time.ParseInLocation(utils.FormatDate, req.Formula, time.Local)
-		if err != nil {
-			br.Msg = "拼接日期有误,请重新输入"
-			return
-		}*/
+	//直接拼接指标
+	//校验时间格式
+	_, err = time.ParseInLocation(utils.FormatDate, req.Formula, time.Local)
+	if err != nil {
+		br.Msg = "拼接日期有误,请重新输入"
+		return
+	}*/
 	case utils.DATA_SOURCE_PREDICT_CALCULATE_NHCC: //拟合残差指标
 		//指标校验
 		if len(req.EdbInfoIdArr) != 2 {
@@ -650,25 +647,9 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		nhccDate.StartDate = startDate
 		nhccDate.EndDate = endDate
 	}
-	if fromEdbInfoId <= 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	// 来源预测指标信息
-	fromEdbInfo, err := models.GetEdbInfoById(fromEdbInfoId)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败:Err:" + err.Error()
-		return
-	}
-	if fromEdbInfo.EdbInfoType != 1 {
-		br.Msg = "来源指标不是预测指标"
-		br.ErrMsg = "来源指标不是预测指标"
-		return
-	}
 
 	if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ {
-		if req.EdbInfoId <=0 {
+		if req.EdbInfoId <= 0 {
 			if req.Frequency != fromEdbInfo.Frequency {
 				br.Msg = "当前频度和原指标频度不一致"
 				return
@@ -681,7 +662,7 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		sourName = "预测同比"
 		edbInfo, latestDateStr, latestValue, err, errMsg = models.SavePredictCalculateTbz(req.EdbInfoId, req.ClassifyId, req.EdbName, req.Frequency, req.Unit, req.Formula, fromEdbInfo, edbCode, uniqueCode, adminId, adminName)
 	} else if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_TCZ {
-		if req.EdbInfoId <=0 {
+		if req.EdbInfoId <= 0 {
 			if req.Frequency != fromEdbInfo.Frequency {
 				br.Msg = "当前频度和原指标频度不一致"
 				return