fix

models/edb_data_calculate_avg.go

@@ -345,12 +345,10 @@ func (obj CalculateAvg) refresh(to *gorm.DB, edbInfoId, source, subSource int, e
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 
-	//获取指标所有数据
-	dataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&dataList).Error
+
+	//获取指标所有数据
+	dataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_cjjx.go

@@ -238,12 +238,10 @@ func refreshAllCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource int, from
 	if err != nil {
 		return
 	}
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}
@@ -363,6 +361,7 @@ func refreshAllCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource int, from
 			return err
 		}
 	}
+
 	return
 }
 

models/edb_data_calculate_hbz.go

@@ -210,13 +210,11 @@ func refreshAllCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 		dataMap[v.DataTime] = v
 	}
 	fmt.Println("source:", source)
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
+
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_hcz.go

@@ -209,16 +209,12 @@ func refreshAllCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 		dateArr = append(dateArr, v.DataTime)
 		dataMap[v.DataTime] = v
 	}
-	fmt.Println("source:", source)
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
+
 	dataTableName := GetEdbDataTableName(source, subSource)
 	fmt.Println("dataTableName:", dataTableName)
 
-	var existPars []interface{}
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId, existPars).Find(&existDataList).Error
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_ljz.go

@@ -634,10 +634,7 @@ func (obj Ljz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInfo, f
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_ljznczj.go

@@ -361,10 +361,7 @@ func (obj LjzNczj) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInf
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_ljzzj.go

@@ -264,11 +264,9 @@ func (obj Ljzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, fromEdbI
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
+
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_ljzzy.go

@@ -232,12 +232,10 @@ func refreshAllCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource int, fro
 
 	addSql := ` INSERT INTO edb_data_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_percentile.go

@@ -252,10 +252,7 @@ func (obj Percentile) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo, edbCod
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}

models/edb_data_calculate_rjz.go

@@ -210,13 +210,10 @@ func refreshAllCalculateRjz(to *gorm.DB, edbInfoId, source int, fromEdbInfo *Edb
 		dataMap[v.DataTime] = v
 	}
 	fmt.Println("source:", source)
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, utils.DATA_SUB_SOURCE_EDB)
-	fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, 0)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_standard_deviation.go

@@ -242,10 +242,7 @@ func (obj StandardDeviation) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo,
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_sum.go

@@ -350,12 +350,10 @@ func (obj CalculateSum) refresh(to *gorm.DB, edbInfoId, source, subSource int, e
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 
-	//获取指标所有数据
-	dataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Exec(sql, edbInfoId).Scan(&dataList).Error
+
+	//获取指标所有数据
+	dataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_tbz.go

@@ -220,13 +220,10 @@ func refreshAllCalculateTbz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 		return err
 	}
 
-	//获取当前已经入库的指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	//fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_tcz.go

@@ -210,12 +210,10 @@ func refreshAllCalculateTcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 		dateArr = append(dateArr, v.DataTime)
 		dataMap[v.DataTime] = v
 	}
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_time_shift.go

@@ -243,13 +243,10 @@ func refreshAllCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSource, for
 		dataMap[v.DataTime] = v
 	}
 	fmt.Println("source:", source)
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_zdyfx.go

@@ -194,10 +194,7 @@ func (obj CustomAnalysis) refresh(to *gorm.DB, edbInfo *EdbInfo, dateList []stri
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return err
 	}

models/edb_data_calculate_zsxy.go

@@ -235,10 +235,7 @@ func (obj ExponentialSmoothing) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbIn
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return err
 	}

models/predict_edb_data_base.go

@@ -389,10 +389,7 @@ func (obj PredictStandardBase) refresh(to *gorm.DB, edbInfo *EdbInfo, predictEdb
 	latestDateStr = fromEdbInfo.LatestDate
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}

models/predict_edb_data_calculate_cjjx.go

@@ -212,12 +212,9 @@ func refreshAllPredictCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource in
 		return
 	}
 
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return
 	}
@@ -295,7 +292,7 @@ func refreshAllPredictCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource in
 					}
 					existStr := existValDecimal.String()
 					if existStr != val {
-						sql = ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+						sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 						sql = fmt.Sprintf(sql, dataTableName)
 						err = to.Exec(sql, val, edbInfoId, av).Error
 						if err != nil {
@@ -337,7 +334,7 @@ func refreshAllPredictCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource in
 
 	//确定最终值
 	var finalLast EdbInfoSearchData
-	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_cjjx WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
+	sql := ` SELECT data_time , value FROM edb_data_predict_calculate_cjjx WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfoId, latestDateStr).First(&finalLast).Error
 	if tmpErr != nil {
 		if tmpErr.Error() != utils.ErrNoRow() {

models/predict_edb_data_calculate_hbz.go

@@ -190,14 +190,10 @@ func refreshAllPredictCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int
 		dateArr = append(dateArr, v.DataTime)
 		dataMap[v.DataTime] = v
 	}
-	fmt.Println("source:", source)
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return
 	}
@@ -244,7 +240,7 @@ func refreshAllPredictCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int
 							}
 							existStr := existValDecimal.String()
 							if existStr != val {
-								sql = ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+								sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 								sql = fmt.Sprintf(sql, dataTableName)
 								err = to.Exec(sql, val, edbInfoId, currentItem.DataTime).Error
 								if err != nil {

models/predict_edb_data_calculate_hcz.go

@@ -191,19 +191,10 @@ func refreshAllPredictCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int
 		dataMap[v.DataTime] = v
 	}
 	fmt.Println("source:", source)
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
 
-	var existPars []interface{}
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	//if startDate != "" {
-	//	sql += " AND data_time>=? "
-	//	existPars = append(existPars, startDate)
-	//}
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId, existPars).Find(&existDataList).Error
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return
 	}
@@ -257,7 +248,7 @@ func refreshAllPredictCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int
 							}
 							existStr := existValDecimal.String()
 							if existStr != val {
-								sql = ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+								sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 								sql = fmt.Sprintf(sql, dataTableName)
 								err = to.Exec(sql, val, edbInfoId, currentItem.DataTime).Error
 								if err != nil {

models/predict_edb_data_calculate_ljz.go

@@ -509,10 +509,7 @@ func (obj PredictLjz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edb
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}
@@ -598,7 +595,7 @@ func (obj PredictLjz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edb
 	// 确定实际数据的最终值
 	{
 		var finalLast EdbInfoSearchData
-		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		sql := fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).First(&finalLast).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return

models/predict_edb_data_calculate_ljznczj.go

@@ -356,10 +356,7 @@ func (obj PredictLjzNczj) refresh(to *gorm.DB, edbInfoId, source, subSource int,
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}
@@ -446,7 +443,7 @@ func (obj PredictLjzNczj) refresh(to *gorm.DB, edbInfoId, source, subSource int,
 	//确定实际数据的最终值
 	{
 		var finalLast EdbInfoSearchData
-		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		sql := fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).First(&finalLast).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return

models/predict_edb_data_calculate_ljzzj.go

@@ -265,10 +265,7 @@ func (obj PredictLjzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, f
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return
 	}
@@ -372,7 +369,7 @@ func (obj PredictLjzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, f
 	//确定实际数据的最终值
 	{
 		var finalLast EdbInfoSearchData
-		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		sql := fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).First(&finalLast).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return

models/predict_edb_data_calculate_ljzzy.go

@@ -206,12 +206,10 @@ func refreshAllPredictCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource i
 
 	addSql := ` INSERT INTO edb_data_predict_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return
 	}
@@ -314,7 +312,7 @@ func refreshAllPredictCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource i
 
 	//确定最终值
 	var finalLast EdbInfoSearchData
-	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_ljzzy WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
+	sql := ` SELECT data_time , value FROM edb_data_predict_calculate_ljzzy WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfoId, latestDateStr).First(&finalLast).Error
 	if tmpErr != nil {
 		if tmpErr.Error() != utils.ErrNoRow() {

models/predict_edb_data_calculate_nszydbpjjs.go

@@ -218,13 +218,13 @@ func refreshAllPredictCalculateNszydpjjs(to *gorm.DB, edbInfoId, source, subSour
 	fmt.Println("refreshAllCalculateNszydpjjs startDate:", startDate)
 
 	// 获取关联指标数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
 
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
+	if err != nil {
+		return
+	}
 
 	existDataMap := make(map[string]*EdbData)
 	removeDataTimeMap := make(map[string]int) //需要移除的日期数据

models/predict_edb_data_calculate_percentile.go

@@ -265,10 +265,7 @@ func (obj PredictPercentile) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo,
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}

models/predict_edb_data_calculate_standard_deviation.go

@@ -275,10 +275,7 @@ func (obj PredictStandardDeviation) refresh(to *gorm.DB, edbInfo, fromEdbInfo *E
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}

models/predict_edb_data_calculate_tbz.go

@@ -279,12 +279,7 @@ func (obj PredictTb) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo, edbCode
 	latestDateStr = fromEdbInfo.LatestDate
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	//fmt.Println("dataTableName:", dataTableName)
-
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}

models/predict_edb_data_calculate_tcz.go

@@ -381,12 +381,10 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source, subSource int, fromEdbInfo
 		dateArr = append(dateArr, v.DataTime)
 		dataMap[v.DataTime] = v
 	}
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+
+	//获取指标所有数据
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return
 	}

models/predict_edb_data_calculate_time_shift.go

@@ -222,14 +222,11 @@ func refreshAllPredictCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSour
 		dataMap[v.DataTime] = v
 	}
 
+	dataTableName := GetEdbDataTableName(source, subSource)
 	//fmt.Println("source:", source)
+
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	dataTableName := GetEdbDataTableName(source, subSource)
-	//fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
 	if err != nil {
 		return
 	}
@@ -270,7 +267,7 @@ func refreshAllPredictCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSour
 				}
 				existStr := existValDecimal.String()
 				if existStr != valStr {
-					sql = ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+					sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 					sql = fmt.Sprintf(sql, dataTableName)
 					err = to.Exec(sql, valStr, edbInfoId, newDate.Format(utils.FormatDate)).Error
 					if err != nil {

models/predict_edb_data_calculate_zsxy.go

@@ -258,10 +258,7 @@ func (obj PredictExponentialSmoothing) refresh(to *gorm.DB, edbInfo, fromEdbInfo
 	}
 
 	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
+	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource)
 	if err != nil {
 		return
 	}