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

models/edb_data_base.go

@@ -120,7 +120,7 @@ func GetEdbDataByDate(source, subSource int, edbCode, dataTime string) (item *Ed
 
 func ModifyEdbDataById(source, subSource, edbDataId int, value string) (err error) {
 	tableName := GetEdbDataTableName(source, subSource)
-	sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_data_id=? `
+	sql := ` UPDATE %s SET "value"=?,modify_time=NOW() WHERE edb_data_id=? `
 	sql = fmt.Sprintf(sql, tableName)
 	err = global.DEFAULT_DmSQL.Exec(sql, value, edbDataId).Error
 	return
@@ -155,11 +155,12 @@ func GetAllEdbDataListByTo(to *gorm.DB, edbInfoId, source, subSource int) (exist
 // GetFinalLastByTo 获取所有的指标数据列表
 func GetFinalLastByTo(to *gorm.DB, edbInfoId, source, subSource int, latestDate string) (finalLast EdbInfoSearchData, err error) {
 	dataTableName := GetEdbDataTableName(source, subSource)
-	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, latestDate).First(&finalLast).Error
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
 	}
+	finalLast.DataTime = utils.GormDateStrToDateStr(finalLast.DataTime)
 	return
 }