|
@@ -534,6 +534,19 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
+
|
|
|
+ // 新增指标配置关系
|
|
|
+ _, err = residual_analysis_model.SaveConfigMapping(residual_analysis_model.CalculateResidualAnalysisConfigMapping{
|
|
|
+ CalculateResidualAnalysisConfigId: req.ConfigId,
|
|
|
+ EdbInfoId: edbInfoId,
|
|
|
+ ResidualType: req.ResidualType,
|
|
|
+ IndexType: req.IndexType,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ ModifyTime: time.Now(),
|
|
|
+ })
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 新增数据
|
|
@@ -547,24 +560,12 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
+ // 新增自变量 因变量与配置得关系 配置中不存在该指标,则新增
|
|
|
var indexMap = make(map[int64]residual_analysis_model.CalculateResidualAnalysisConfigMapping)
|
|
|
for _, mapping := range mappingList {
|
|
|
indexMap[mapping.EdbInfoId] = mapping
|
|
|
}
|
|
|
|
|
|
- if _, ok := indexMap[edbInfoId]; !ok {
|
|
|
- _, err = residual_analysis_model.SaveConfigMapping(residual_analysis_model.CalculateResidualAnalysisConfigMapping{
|
|
|
- CalculateResidualAnalysisConfigId: req.ConfigId,
|
|
|
- EdbInfoId: edbInfoId,
|
|
|
- ResidualType: req.ResidualType,
|
|
|
- IndexType: req.IndexType,
|
|
|
- CreateTime: time.Now(),
|
|
|
- ModifyTime: time.Now(),
|
|
|
- })
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- }
|
|
|
if _, ok := indexMap[int64(req.EdbInfoIdA)]; !ok {
|
|
|
_, err = residual_analysis_model.SaveConfigMapping(residual_analysis_model.CalculateResidualAnalysisConfigMapping{
|
|
|
CalculateResidualAnalysisConfigId: req.ConfigId,
|