Merge branch 'eta_bug_7029_residual_1227@guomengyuan'

models/residual_analysis_model/calculate_residual_analysis_config.go

@@ -136,6 +136,7 @@ type ResidualAnalysisIndexSaveReq struct {
 
 // ResidualAnalysisConfigVo 残差分析配置vo
 type ResidualAnalysisConfigVo struct {
+	ResidualType     int     `description:"残差类型: 1-映射残差 2-拟合残差"`
 	DateType         int     `description:"时间类型 -1-自定义时间 0-至今 n-枚举时间（近n年）"`
 	StartDate        string  `description:"自定义开始日期"`
 	EndDate          string  `description:"自定义结束日期"`

services/residual_analysis_service/residual_analysis_service.go

@@ -747,7 +747,7 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 			EdbName:         req.EdbName,
 			EdbNameEn:       req.EdbNameEn,
 			ClassifyId:      req.ClassifyId,
-			EdbType:         req.EdbType,
+			EdbType:         2,
 			Unit:            req.Unit,
 			UnitEn:          req.UnitEn,
 			Frequency:       req.Frequency,
@@ -822,6 +822,8 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 		req.DataList[i].EdbDataId = 0
 		req.DataList[i].EdbInfoId = int(edbInfoId)
 		req.DataList[i].EdbCode = edbCode
+		req.DataList[i].CreateTime = time.Now()
+		req.DataList[i].ModifyTime = time.Now()
 	}
 	_, err = residual_analysis_model.AddResidualAnalysisData(req.DataList)
 	if err != nil {
@@ -998,6 +1000,7 @@ func ResidualAnalysisDetail(edbInfoId int) (residual_analysis_model.ResidualAnal
 func SaveResidualAnalysisConfig(req residual_analysis_model.ResidualAnalysisReq, sysUser *system.Admin) (int64, error) {
 
 	config := residual_analysis_model.ResidualAnalysisConfigVo{
+		ResidualType:     req.ResidualType,
 		DateType:         req.DateType,
 		StartDate:        req.StartDate,
 		EndDate:          req.EndDate,