预测指标计算去掉指标拼接

controllers/base_from_predict_calculate.go

@@ -586,14 +586,14 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 			br.Msg = "N值输入错误,请重新输入"
 			return
 		}
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_ZJPJ:
+	/*case utils.DATA_SOURCE_PREDICT_CALCULATE_ZJPJ:
 		//直接拼接指标
 		//校验时间格式
 		_, 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 {
@@ -704,67 +704,6 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 	} else if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_TIME_SHIFT {
 		sourName = "预测时间移位"
 		edbInfo, latestDateStr, latestValue, err = models.SavePredictCalculateTimeShift(&req, fromEdbInfo, edbCode, uniqueCode, adminId, adminName)
-	} else if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_LJZTBPJ {
-		sourName = "预测累计值同比拼接"
-
-		if fromEdbInfo.Frequency != "月度" {
-			br.Msg = "待拼接指标只能筛选月度指标"
-			br.ErrMsg = "待拼接指标只能筛选月度指标"
-			return
-		}
-		if len(req.EdbInfoIdArr) != 1 {
-			br.Msg = "请传入同比值指标"
-			br.ErrMsg = "请传入同比值指标"
-			return
-		}
-
-		secondEdbInfoReq := req.EdbInfoIdArr[0]
-		tbzEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if tmpErr != nil {
-			br.Msg = "获取同比值指标信息失败"
-			br.ErrMsg = "获取同比值指标信息失败:Err:" + tmpErr.Error()
-			return
-		}
-		if tbzEdbInfo.Source != utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ {
-			br.Msg = "指标必须是传入同比值指标类型"
-			br.ErrMsg = "指标必须是传入同比值指标类型"
-			return
-		}
-		if tbzEdbInfo.Frequency != "月度" {
-			br.Msg = "同比值指标只能筛选月度指标"
-			br.ErrMsg = "同比值指标只能筛选月度指标"
-			return
-		}
-
-		if fromEdbInfo.EdbInfoId == tbzEdbInfo.EdbInfoId {
-			br.Msg = "两个指标不允许为同一个"
-			br.ErrMsg = "两个指标不允许为同一个"
-			return
-		}
-		edbInfo, latestDateStr, latestValue, err = models.SavePredictCalculateLjztbpj(&req, fromEdbInfo, tbzEdbInfo, edbCode, uniqueCode, adminId, adminName)
-	}else if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_ZJPJ {
-		sourName = "预测直接拼接"
-
-		if len(req.EdbInfoIdArr) != 1 {
-			br.Msg = "请传入拼接日期之后的指标"
-			br.ErrMsg = "请传入拼接日期之后的指标"
-			return
-		}
-
-		secondEdbInfoReq := req.EdbInfoIdArr[0]
-		secondEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if tmpErr != nil {
-			br.Msg = "获取拼接日期之后的指标信息失败"
-			br.ErrMsg = "获取拼接日期之后的指标信息失败:Err:" + tmpErr.Error()
-			return
-		}
-
-		if fromEdbInfo.EdbInfoId == secondEdbInfo.EdbInfoId {
-			br.Msg = "两个指标不允许为同一个"
-			br.ErrMsg = "两个指标不允许为同一个"
-			return
-		}
-		edbInfo, latestDateStr, latestValue, err = models.SavePredictCalculateZjpj(&req, fromEdbInfo, secondEdbInfo, edbCode, uniqueCode, adminId, adminName)
 	} else if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_CJJX {
 		sourName = "预测超季节性"
 		edbInfo, latestDateStr, latestValue, err = models.SavePredictCalculateCjjx(&req, fromEdbInfo, edbCode, uniqueCode, adminId, adminName, formulaInt)