Roc 2 giorni fa
parent
commit
dc3e7b5090

+ 1 - 1
models/calculate_residual_analysis_config_mapping.go

@@ -11,7 +11,7 @@ type CalculateResidualAnalysisConfigMapping struct {
 	CalculateResidualAnalysisConfigId        int       `gorm:"column:calculate_residual_analysis_config_id" description:"残差分析配置id"`
 	EdbInfoId                                int64     `gorm:"column:edb_info_id" description:"指标id"`
 	ResidualType                             int       `gorm:"column:residual_type" description:"残差类型: 1-映射残差 2-拟合残差"`
-	IndexType                                int       `gorm:"column:index_type)" description:"指标类型:1-映射指标 2-残差指标 3-因变量指标 4-自变量指标"`
+	IndexType                                int       `gorm:"column:index_type" description:"指标类型:1-映射指标 2-残差指标 3-因变量指标 4-自变量指标"`
 	CreateTime                               time.Time `gorm:"column:create_time" description:"创建时间"`
 	ModifyTime                               time.Time `gorm:"column:modify_time" description:"修改时间"`
 }

+ 14 - 12
models/edb_data_residual_analysis.go

@@ -580,19 +580,21 @@ func fillMappingChartInfo(config ResidualAnalysisConfig, req *EdbInfo, edbInfoMa
 func FillDataBList(dataList []*EdbData, edbInfoMappingA *EdbInfoList) []*EdbData {
 	dataAList := edbInfoMappingA.DataList
 
-	for utils.StringToTime(dataList[len(dataList)-1].DataTime).Before(utils.StringToTime(dataAList[len(dataAList)-1].DataTime)) {
-		// 使用A的时间填充时间差
-		timeDiff := utils.GetNextDayN(dataList[len(dataList)-1].DataTime, 1)
-
-		// 创建新的数据点并填充 前值填充
-		newDataPoint := &EdbData{
-			DataTime:      timeDiff,
-			Value:         dataList[len(dataList)-1].Value,
-			DataTimestamp: utils.StringToTime(timeDiff).UnixMilli(),
-		}
+	if len(dataList) > 0 && len(dataAList) > 0 {
+		for utils.StringToTime(dataList[len(dataList)-1].DataTime).Before(utils.StringToTime(dataAList[len(dataAList)-1].DataTime)) {
+			// 使用A的时间填充时间差
+			timeDiff := utils.GetNextDayN(dataList[len(dataList)-1].DataTime, 1)
+
+			// 创建新的数据点并填充 前值填充
+			newDataPoint := &EdbData{
+				DataTime:      timeDiff,
+				Value:         dataList[len(dataList)-1].Value,
+				DataTimestamp: utils.StringToTime(timeDiff).UnixMilli(),
+			}
 
-		// 将新数据点添加到dataList末尾
-		dataList = append(dataList, newDataPoint)
+			// 将新数据点添加到dataList末尾
+			dataList = append(dataList, newDataPoint)
+		}
 	}
 
 	return dataList