Roc пре 4 месеци
родитељ
комит
def412829b
3 измењених фајлова са 7 додато и 9 уклоњено
  1. 2 3
      controllers/base_from_predict_calculate.go
  2. 3 4
      controllers/base_from_python.go
  3. 2 2
      models/edb_info.go

+ 2 - 3
controllers/base_from_predict_calculate.go

@@ -227,13 +227,12 @@ func addPredictCalculate(br *models.BaseResponse, req models.EdbInfoCalculateSav
 		UnitEn:           req.Unit,
 		Sort:             models.GetAddEdbMaxSortByClassifyId(req.ClassifyId, utils.PREDICT_EDB_INFO_TYPE),
 	}
-	edbInfoId, err := models.AddEdbInfo(edbInfo)
+	err = models.AddEdbInfo(edbInfo)
 	if err != nil {
 		br.Msg = "生成计算指标失败"
 		br.Msg = "生成计算指标失败,AddEdbInfo Err:" + err.Error()
 		return
 	}
-	edbInfo.EdbInfoId = int(edbInfoId)
 
 	//处理同名指标
 	{
@@ -284,7 +283,7 @@ func addPredictCalculate(br *models.BaseResponse, req models.EdbInfoCalculateSav
 		return
 	}
 	resp := models.AddEdbInfoResp{
-		EdbInfoId:  int(edbInfoId),
+		EdbInfoId:  edbInfo.EdbInfoId,
 		UniqueCode: uniqueCode,
 	}
 	br.Ret = 200

+ 3 - 4
controllers/base_from_python.go

@@ -183,13 +183,12 @@ func (this *PythonController) Add() {
 		Sort:            models.GetAddEdbMaxSortByClassifyId(req.ClassifyId, utils.EDB_INFO_TYPE),
 	}
 
-	edbInfoId, err := models.AddEdbInfo(edbInfo)
+	err = models.AddEdbInfo(edbInfo)
 	if err != nil {
 		br.Msg = "生成python运算指标失败"
 		br.Msg = "生成python运算指标失败,AddEdbInfo Err:" + err.Error()
 		return
 	}
-	edbInfo.EdbInfoId = int(edbInfoId)
 
 	//处理同名指标
 	{
@@ -214,7 +213,7 @@ func (this *PythonController) Add() {
 
 	// 存储python代码
 	edbPythonCode := &models.EdbPythonCode{
-		EdbInfoId:  int(edbInfoId),
+		EdbInfoId:  edbInfo.EdbInfoId,
 		EdbCode:    edbInfo.EdbCode,
 		PythonCode: req.PythonCode,
 		ModifyTime: time.Now(),
@@ -246,7 +245,7 @@ func (this *PythonController) Add() {
 		return
 	}
 	resp := models.AddEdbInfoResp{
-		EdbInfoId:  int(edbInfoId),
+		EdbInfoId:  edbInfo.EdbInfoId,
 		UniqueCode: uniqueCode,
 	}
 	br.Ret = 200

+ 2 - 2
models/edb_info.go

@@ -126,9 +126,9 @@ func (e *EdbInfo) ConvertDate() {
 }
 
 // AddEdbInfo 添加指标
-func AddEdbInfo(item *EdbInfo) (lastId int64, err error) {
-
+func AddEdbInfo(item *EdbInfo) (err error) {
 	err = global.DEFAULT_DmSQL.Create(item).Error
+
 	return
 }