残差指标保存

models/residual_analysis_model/calculate_residual_analysis_config.go

@@ -22,6 +22,7 @@ type ResidualAnalysisReq struct {
 	EdbInfoIdA       int     `description:"指标A"`
 	EdbInfoIdB       int     `description:"指标B"`
 	EdbInfoId        int     `description:"残差指标id"`
+	ConfigId         int     `description:"配置id"`
 	QueryType        int     `description:"查询类型区分 避免查询过慢 1-查询第一个表格 2-查询需要计算的表格"`
 	ResidualType     int     `description:"残差类型: 1-映射残差 2-拟合残差"`
 	DateType         int     `description:"时间类型 -1-自定义时间 0-至今 n-枚举时间（近n年）"`

services/residual_analysis_service/residual_analysis_service.go

@@ -747,27 +747,42 @@ func SaveResidualAnalysisConfig(req residual_analysis_model.ResidualAnalysisReq,
 		return 0, err
 	}
 
-	var condition string
-	var pars []interface{}
 	// 新增or更新
-	if req.EdbInfoId > 0 {
-		condition += " and edb_info_id=?"
-		pars = append(pars, req.EdbInfoId)
-		configMappings, err := residual_analysis_model.GetConfigMappingListByCondition(condition, pars)
-		if err != nil {
-			return 0, err
-		}
-		if len(configMappings) > 0 {
-			mapping := configMappings[0]
-			configInfo, err := residual_analysis_model.GetResidualAnalysisConfigById(mapping.CalculateResidualAnalysisConfigId)
+	/*
+		var condition string
+			var pars []interface{}
+		if req.EdbInfoId > 0 {
+			condition += " and edb_info_id=?"
+			pars = append(pars, req.EdbInfoId)
+			configMappings, err := residual_analysis_model.GetConfigMappingListByCondition(condition, pars)
 			if err != nil {
 				return 0, err
 			}
-			configInfo.Config = string(configJson)
-			err = residual_analysis_model.UpdateResidualAnalysisConfig(configInfo)
-			if err != nil {
-				return 0, err
+			if len(configMappings) > 0 {
+				mapping := configMappings[0]
+				configInfo, err := residual_analysis_model.GetResidualAnalysisConfigById(mapping.CalculateResidualAnalysisConfigId)
+				if err != nil {
+					return 0, err
+				}
+				configInfo.Config = string(configJson)
+				err = residual_analysis_model.UpdateResidualAnalysisConfig(configInfo)
+				if err != nil {
+					return 0, err
+				}
 			}
+		}*/
+	var configId int64
+	if req.ConfigId > 0 {
+		configInfo, err2 := residual_analysis_model.GetResidualAnalysisConfigById(req.ConfigId)
+		if err2 != nil {
+			return 0, err2
+		}
+		configId = int64(configInfo.CalculateResidualAnalysisConfigId)
+		configInfo.Config = string(configJson)
+
+		err = residual_analysis_model.UpdateResidualAnalysisConfig(configInfo)
+		if err != nil {
+			return 0, err
 		}
 	}
 
@@ -778,7 +793,7 @@ func SaveResidualAnalysisConfig(req residual_analysis_model.ResidualAnalysisReq,
 		ModifyTime: time.Now(),
 	}
 
-	configId, err := residual_analysis_model.SaveResidualAnalysisConfig(analysisConfig)
+	configId, err = residual_analysis_model.SaveResidualAnalysisConfig(analysisConfig)
 	if err != nil {
 		return 0, err
 	}