Merge remote-tracking branch 'origin/master' into pool/168

controllers/base_from_predict_calculate.go

@@ -519,7 +519,7 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 
 	// 基础指标id
 	fromEdbInfoId := req.FromEdbInfoId
-	notNeedFromEdbSourceList := []int{utils.DATA_SOURCE_PREDICT_CALCULATE_KSZS} // 不需要传入来源指标id的 指标类型
+	notNeedFromEdbSourceList := []int{utils.DATA_SOURCE_PREDICT_CALCULATE_KSZS, utils.DATA_SOURCE_PREDICT_CALCULATE_NHCC} // 不需要传入来源指标id的 指标类型
 	if fromEdbInfoId <= 0 && !utils.InArrayByInt(notNeedFromEdbSourceList, req.Source) {
 		br.Msg = "请选择指标"
 		return
@@ -563,22 +563,6 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		return
 	}
 
-	// 来源预测指标信息
-	var fromEdbInfo *models.EdbInfo
-	if req.FromEdbInfoId > 0 {
-		fromEdbInfo, err = models.GetEdbInfoById(req.FromEdbInfoId)
-		if err != nil {
-			br.Msg = "获取指标信息失败"
-			br.ErrMsg = "获取指标信息失败:Err:" + err.Error()
-			return
-		}
-		if fromEdbInfo.EdbInfoType != 1 {
-			br.Msg = "来源指标不是预测指标"
-			br.ErrMsg = "来源指标不是预测指标"
-			return
-		}
-	}
-
 	//生成指标编码
 	randStr := utils.GetRandDigit(4)
 	edbCode := `C` + time.Now().Format("060102") + randStr
@@ -653,6 +637,22 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		return
 	}
 
+	// 来源预测指标信息
+	var fromEdbInfo *models.EdbInfo
+	if fromEdbInfoId > 0 {
+		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.Frequency != fromEdbInfo.Frequency {