|
@@ -10,7 +10,7 @@ import (
|
|
|
)
|
|
|
|
|
|
type BaseFromChangesVisitorsCovid struct {
|
|
|
- Id int `orm:"column(id);pk"`
|
|
|
+ Id int `orm:"column(id);pk"`
|
|
|
Entity string `description:"国家"`
|
|
|
Code string `description:"国家编码"`
|
|
|
EdbCode string `description:"指标ID"`
|
|
@@ -34,7 +34,7 @@ func GetBaseFromChangesVisitorsCovidDataAllByIndexCode(indexCode string) (list [
|
|
|
}
|
|
|
|
|
|
func GetBaseFromChangesVisitorsCovidDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromChangesVisitorsCovid, err error) {
|
|
|
- sql := ` SELECT * FROM base_from_trade_dalian_index WHERE 1=1 `
|
|
|
+ sql := ` SELECT * FROM base_from_changes_visitors_covid WHERE 1=1 `
|
|
|
o := orm.NewOrm()
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
@@ -61,7 +61,7 @@ func AddEdbDataGoogleTravel(edbCode string) (err error) {
|
|
|
dataTime, err := time.Parse(utils.FormatDate, eDate)
|
|
|
if err != nil {
|
|
|
fmt.Println("time.Parse Err:" + eDate)
|
|
|
- return err
|
|
|
+ return err
|
|
|
}
|
|
|
timestamp := dataTime.UnixNano() / 1e6
|
|
|
timeStr := fmt.Sprintf("%d", timestamp)
|
|
@@ -102,7 +102,9 @@ func RefreshEdbDataGoogleTravel(edbInfoId int, edbCode, startDate string) (err e
|
|
|
}
|
|
|
|
|
|
dataList, err := GetBaseFromChangesVisitorsCovidDataByTradeCode(condition, pars)
|
|
|
-
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
//获取指标所有数据
|
|
|
var existCondition string
|
|
|
var existPars []interface{}
|
|
@@ -163,4 +165,4 @@ func RefreshEdbDataGoogleTravel(edbInfoId int, edbCode, startDate string) (err e
|
|
|
}
|
|
|
}
|
|
|
return
|
|
|
-}
|
|
|
+}
|