Browse Source

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

gmy 4 months ago
parent
commit
03c7701fdf

+ 1 - 0
models/residual_analysis_model/calculate_residual_analysis_config.go

@@ -125,6 +125,7 @@ type ResidualAnalysisIndexSaveReq struct {
 	FrequencyEn  string                    `description:"英文频率"`
 	Unit         string                    `description:"单位"`
 	UnitEn       string                    `description:"英文单位"`
+	Calendar     string                    `description:"公历/农历"`
 	ClassifyId   int                       `description:"分类id"`
 	ConfigId     int                       `description:"残差配置id"`
 	ResidualType int                       `orm:"column(residual_type)" description:"残差类型: 1-映射残差 2-拟合残差"`

+ 3 - 0
services/residual_analysis_service/residual_analysis_service.go

@@ -511,8 +511,11 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 			Frequency:       req.Frequency,
 			Source:          req.Source,
 			SourceName:      "残差分析",
+			Calendar:        req.Calendar,
 			SysUserRealName: sysUser.RealName,
 			SysUserId:       sysUser.AdminId,
+			LatestDate:      indexLatestDate,
+			LatestValue:     indexLatestValue,
 			CreateTime:      time.Now(),
 			ModifyTime:      time.Now(),
 		})