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

services/residual_analysis_service/residual_analysis_service.go

@@ -29,10 +29,10 @@ func ResidualAnalysisPreview(req residual_analysis_model.ResidualAnalysisReq) (r
 		}
 	}
 	if edbInfoMappingA == nil {
-		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("指标A不存在", nil)
+		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("指标A不存在")
 	}
 	if edbInfoMappingB == nil {
-		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("指标B不存在", nil)
+		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("指标B不存在")
 	}
 
 	// 时间处理
@@ -72,7 +72,7 @@ func ResidualAnalysisPreview(req residual_analysis_model.ResidualAnalysisReq) (r
 
 	dataAList, ok := edbInfoMappingA.DataList.([]*data_manage.EdbDataList)
 	if !ok {
-		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("数据类型转换失败", nil)
+		return residual_analysis_model.ResidualAnalysisResp{}, fmt.Errorf("数据类型转换失败")
 	}
 	indexADataMap := map[string]*data_manage.EdbDataList{}
 	for _, indexData := range dataAList {
@@ -139,12 +139,12 @@ func fillResidualChartInfo(edbInfoMappingA *data_manage.ChartEdbInfoMapping, edb
 	}
 	dataAList, ok := edbInfoA.DataList.([]*data_manage.EdbDataList)
 	if !ok {
-		return nil, 0, fmt.Errorf("数据类型转换失败", nil)
+		return nil, 0, fmt.Errorf("数据类型转换失败")
 	}
 	edbData := dataAList
 	dataBList, ok := edbInfoB.DataList.([]*data_manage.EdbDataList)
 	if !ok {
-		return nil, 0, fmt.Errorf("数据类型转换失败", nil)
+		return nil, 0, fmt.Errorf("数据类型转换失败")
 	}
 	var indexDataBMap = make(map[string]*data_manage.EdbDataList)
 	for _, data := range dataBList {
@@ -217,13 +217,13 @@ func fillMappingChartInfo(req residual_analysis_model.ResidualAnalysisReq, edbIn
 
 	dataList, ok := edbInfoMappingB.DataList.([]*data_manage.EdbDataList)
 	if !ok {
-		return nil, a, b, r, fmt.Errorf("数据类型转换失败", nil)
+		return nil, a, b, r, fmt.Errorf("数据类型转换失败")
 	}
 
 	// 领先指标 dataList进行数据处理
 	if req.IndexType == 2 {
 		if req.LeadValue < 0 {
-			return nil, a, b, r, fmt.Errorf("领先值不能小于0", nil)
+			return nil, a, b, r, fmt.Errorf("领先值不能小于0")
 		} else if req.LeadValue > 0 {
 			for _, indexData := range dataList {
 				switch req.LeadFrequency {
@@ -396,7 +396,7 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 		return err
 	}
 	if classifyCount <= 0 {
-		return fmt.Errorf("分类不存在", nil)
+		return fmt.Errorf("分类不存在")
 	}
 
 	// 校验名称是否重复
@@ -467,13 +467,13 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 			return err
 		}
 		if edbInfo == nil {
-			return fmt.Errorf("指标不存在", nil)
+			return fmt.Errorf("指标不存在")
 		}
 		edbInfoId = int64(edbInfo.EdbInfoId)
 		edbCode = edbInfo.EdbCode
 
 		if edbInfoByCondition.EdbInfoId != edbInfo.EdbInfoId {
-			return fmt.Errorf("指标名称重复", nil)
+			return fmt.Errorf("指标名称重复")
 		}
 
 		// 须补充更新指标最大值，最小值，数据最新时间，数据最新值
@@ -481,7 +481,11 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 		edbInfo.MinValue = indexMin
 		edbInfo.LatestDate = indexLatestDate
 		edbInfo.LatestValue = indexLatestValue
-		err = edbInfo.Update([]string{"min_value", "max_value", "latest_date", "latest_value"})
+		edbInfo.Unit = req.Unit
+		edbInfo.Frequency = req.Frequency
+		edbInfo.ClassifyId = req.ClassifyId
+		edbInfo.EdbName = req.EdbName
+		err = edbInfo.Update([]string{"min_value", "max_value", "latest_date", "latest_value", "unit", "frequency", "classify_id", "edb_name"})
 		if err != nil {
 			return err
 		}
@@ -489,11 +493,11 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 		// 删除对应得指标数据
 		err = residual_analysis_model.DeleteResidualAnalysisDataByEdbCode(req.EdbCode)
 		if err != nil {
-			return fmt.Errorf("删除指标数据失败", nil)
+			return fmt.Errorf("删除指标数据失败")
 		}
 	} else {
 		if edbInfoByCondition != nil {
-			return fmt.Errorf("指标名称重复", nil)
+			return fmt.Errorf("指标名称重复")
 		}
 
 		// 新增指标
@@ -602,7 +606,7 @@ func ResidualAnalysisDetail(edbInfoId int) (residual_analysis_model.ResidualAnal
 	}
 
 	if len(mappingList) <= 0 {
-		return residual_analysis_model.ResidualAnalysisDetailResp{}, fmt.Errorf("指标不存在", nil)
+		return residual_analysis_model.ResidualAnalysisDetailResp{}, fmt.Errorf("指标不存在")
 	}
 
 	mapping := mappingList[0]