hsun 1 jaar geleden
bovenliggende
commit
ea591e2103
2 gewijzigde bestanden met toevoegingen van 6 en 4 verwijderingen
  1. 4 4
      models/base_from_national_statistics.go
  2. 2 0
      models/edb_data_table.go

+ 4 - 4
models/base_from_national_statistics.go

@@ -74,7 +74,7 @@ func AddEdbDataFromNationalStatistics(edbCode string) (err error) {
 	return
 }
 
-// RefreshEdbDataFromNationalStatistics 刷新百川盈弗指标数据
+// RefreshEdbDataFromNationalStatistics 刷新国家统计局指标数据
 func RefreshEdbDataFromNationalStatistics(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_NATIONAL_STATISTICS
 	o := orm.NewOrm()
@@ -90,7 +90,7 @@ func RefreshEdbDataFromNationalStatistics(edbInfoId int, edbCode, startDate stri
 		pars = append(pars, edbCode)
 	}
 	if startDate != "" {
-		condition += " AND data_time >= ?"
+		condition += ` AND data_time >= ? `
 		pars = append(pars, startDate)
 	}
 
@@ -116,10 +116,10 @@ func RefreshEdbDataFromNationalStatistics(edbInfoId int, edbCode, startDate stri
 	var existCondition string
 	var existPars []interface{}
 
-	existCondition += " AND edb_info_id=? "
+	existCondition += ` AND edb_info_id = ? `
 	existPars = append(existPars, edbInfoId)
 	if startDate != "" {
-		existCondition += " AND data_time>=? "
+		existCondition += ` AND data_time >= ? `
 		existPars = append(existPars, startDate)
 	}
 

+ 2 - 0
models/edb_data_table.go

@@ -121,6 +121,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_stock_plant"
 	case utils.DATA_SOURCE_CALCULATE_CORRELATION:
 		tableName = "edb_data_calculate_correlation"
+	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
+		tableName = "edb_data_national_statistics"
 	default:
 		tableName = ""
 	}