diff --git a/model/park.go b/model/park.go index 6b464d0..d6a3916 100644 --- a/model/park.go +++ b/model/park.go @@ -61,8 +61,8 @@ type ParkSimplified struct { } type ParkPeriodStatistics struct { - Id string `bun:",notnull" json:"id"` - Name string `bun:",notnull" json:"name"` + Id string `bun:"park__id,notnull" json:"id"` + Name string `bun:"park__name,notnull" json:"name"` Period *time.Time `bun:"type:date" json:"period" time_format:"simple_date" time_location:"shanghai"` } diff --git a/service/statistics.go b/service/statistics.go index e779de0..739e017 100644 --- a/service/statistics.go +++ b/service/statistics.go @@ -66,10 +66,10 @@ func (_StatisticsService) ParksNewestState(userIds ...string) ([]model.ParkPerio Relation("Park", func(q *bun.SelectQuery) *bun.SelectQuery { return q.Column("id", "name") }). - Where("p.enabled = ?", true). - Where("r.publidhed = ?", true) + Where("park.enabled = ?", true). + Where("r.published = ?", true) if len(userIds) > 0 { - query = query.Where("p.user_id in (?)", bun.In(userIds)) + query = query.Where("park.user_id in (?)", bun.In(userIds)) } parks := make([]model.ParkPeriodStatistics, 0) groupedParks := make(map[string]model.ParkPeriodStatistics, 0)