|
@@ -173,6 +173,13 @@ func addPredictCalculate(br *models.BaseResponse, req models.EdbInfoCalculateSav
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //预先计算,判断公式是否正常
|
|
|
|
+ ok, _ := services.CheckFormula2(edbInfoList, formulaMap, calculateFormula, edbInfoIdBytes)
|
|
|
|
+ if !ok {
|
|
|
|
+ br.Msg = "生成计算指标失败,请使用正确的计算公式"
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
// 指标入库
|
|
// 指标入库
|
|
randStr := utils.GetRandDigit(4)
|
|
randStr := utils.GetRandDigit(4)
|
|
edbCode := `C2` + time.Now().Format("060102") + randStr
|
|
edbCode := `C2` + time.Now().Format("060102") + randStr
|
|
@@ -401,6 +408,13 @@ func editPredictCalculate(br *models.BaseResponse, req models.EdbInfoCalculateSa
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //预先计算,判断公式是否正常
|
|
|
|
+ ok, _ := services.CheckFormula2(edbInfoList, formulaMap, calculateFormula, edbInfoIdBytes)
|
|
|
|
+ if !ok {
|
|
|
|
+ br.Msg = "生成计算指标失败,请使用正确的计算公式"
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
//处理同名指标
|
|
//处理同名指标
|
|
{
|
|
{
|
|
edbNameList, err := models.GetEdbInfoByName(req.EdbName)
|
|
edbNameList, err := models.GetEdbInfoByName(req.EdbName)
|