|
@@ -563,22 +563,6 @@ func (this *PredictCalculateController) CalculateBatchSave() {
|
|
return
|
|
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)
|
|
randStr := utils.GetRandDigit(4)
|
|
edbCode := `C` + time.Now().Format("060102") + randStr
|
|
edbCode := `C` + time.Now().Format("060102") + randStr
|
|
@@ -653,6 +637,22 @@ func (this *PredictCalculateController) CalculateBatchSave() {
|
|
return
|
|
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
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ {
|
|
if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ {
|
|
if req.EdbInfoId <= 0 {
|
|
if req.EdbInfoId <= 0 {
|
|
if req.Frequency != fromEdbInfo.Frequency {
|
|
if req.Frequency != fromEdbInfo.Frequency {
|