Merge branch 'eta_2.2.9_residual_analysis_1104@guomengyuan' into debug

models/residual_analysis_model/calculate_residual_analysis_config.go

@@ -154,9 +154,8 @@ type ResidualAnalysisConfigVo struct {
 
 // ResidualAnalysisDetailResp 详情响应接口
 type ResidualAnalysisDetailResp struct {
-	ConfigInfo          *CalculateResidualAnalysisConfig
-	EdbInfoList         []*data_manage.EdbInfoList
-	OriginalEdbInfoList []*data_manage.EdbInfoList
+	ConfigInfo  *CalculateResidualAnalysisConfig
+	EdbInfoList []*data_manage.EdbInfoList
 }
 
 // GetResidualAnalysisConfigById 根据配置id查询配置信息

services/residual_analysis_service/residual_analysis_service.go

@@ -14,10 +14,6 @@ import (
 
 func ResidualAnalysisPreview(req residual_analysis_model.ResidualAnalysisReq) (residual_analysis_model.ResidualAnalysisResp, error) {
 
-	if req.DateType < 0 {
-		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("时间类型错误", nil)
-	}
-
 	mappingList, err := data_manage.GetChartEdbMappingListByEdbInfoIdList([]int{req.EdbInfoIdA, req.EdbInfoIdB})
 	if err != nil {
 		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("获取图表，指标信息失败，Err:%s", err.Error())
@@ -556,7 +552,7 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 			CalculateResidualAnalysisConfigId: req.ConfigId,
 			EdbInfoId:                         int64(req.EdbInfoIdA),
 			ResidualType:                      req.ResidualType,
-			IndexType:                         0,
+			IndexType:                         3,
 			CreateTime:                        time.Now(),
 			ModifyTime:                        time.Now(),
 		})
@@ -567,9 +563,9 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 	if _, ok := indexMap[int64(req.EdbInfoIdB)]; !ok {
 		_, err = residual_analysis_model.SaveConfigMapping(residual_analysis_model.CalculateResidualAnalysisConfigMapping{
 			CalculateResidualAnalysisConfigId: req.ConfigId,
-			EdbInfoId:                         int64(req.EdbInfoIdA),
+			EdbInfoId:                         int64(req.EdbInfoIdB),
 			ResidualType:                      req.ResidualType,
-			IndexType:                         0,
+			IndexType:                         4,
 			CreateTime:                        time.Now(),
 			ModifyTime:                        time.Now(),
 		})