Merge remote-tracking branch 'origin/dm' into dm

models/edb_info.go

@@ -911,6 +911,7 @@ func UnifiedModifyPredictEdbInfoMaxAndMinInfo(edbInfo *EdbInfo, latestDateStr st
 	maxAndMinItem.EndValue = maxAndMinItem.LatestValue
 
 	if maxAndMinItem != nil {
+		latestDateStr = utils.GormDateStrToDateStr(latestDateStr)
 		maxAndMinItem.LatestDate = latestDateStr
 		maxAndMinItem.LatestValue = latestValue
 		err = ModifyPredictEdbInfoMaxAndMinInfo(edbInfo.EdbInfoId, maxAndMinItem)

models/factor_edb_series_calculate_data_qjjs.go

@@ -188,7 +188,7 @@ func TransEdbSeriesCalculateDataQjjs2EdbDataList(items []*FactorEdbSeriesCalcula
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetEdbDataList(seriesId int, edbInfoId int, startDate, endDate string) (list []*EdbDataList, err error) {
 	var pars []interface{}
-	sql := `SELECT factor_edb_series_calculate_data_id as edb_data_id  ,edb_info_id,data_time,value,data_timestamp FROM %s WHERE edb_info_id=? and factor_edb_series_id=? `
+	sql := `SELECT factor_edb_series_calculate_data_id as edb_data_id  ,edb_info_id,data_time,"value",data_timestamp FROM %s WHERE edb_info_id=? and factor_edb_series_id=? `
 	pars = append(pars, edbInfoId, seriesId)
 	if startDate != "" {
 		sql += ` AND data_time>=? `