diff --git a/app/mobile/router/org_player.go b/app/mobile/router/org_player.go index 04f8e7ac25a185f649296077e89f2185ee97e037..44b8713a77da08c9bcd4f39c53c93e263d98ca61 100755 --- a/app/mobile/router/org_player.go +++ b/app/mobile/router/org_player.go @@ -17,6 +17,8 @@ func registerOrgPlayerRouter(v1 *gin.RouterGroup) { r.GET("", api.GetPage) r.GET("/:id", api.Get) r.GET("/info/:id", api.GetInfo) + r.GET("/get-match-season", api.GetOrgMatchSeason) r.GET("/evaluate", api.GetOrgMatchEvaluate) + r.GET("/get-rounds", api.GetOrgRounds) } } diff --git a/app/mobile/service/org_player.go b/app/mobile/service/org_player.go index 52a869ca9a1381add401d248fa1d86ef5b465d7e..a6f66bbc91ab61261879d840c6ca9ced24ddfa8c 100755 --- a/app/mobile/service/org_player.go +++ b/app/mobile/service/org_player.go @@ -299,16 +299,15 @@ func (e *OrgPlayer) GetSeasonRoundsScoring(playerId string, matchId []string, da func (e *OrgPlayer) GetOrgRounds(c *dto.GetRoundsReq, list *[]dto.GetRoundsReply, count *int64) error { var err error - err = e.Orm.Table("org_match_evaluate as ome"). - Select("op.id,op.player_name,op.player_number,op.player_img,op.position,op.sex,op.status"). - Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id"). + err = e.Orm.Table("org_match_team_player as omtp"). + Select("omtp.id,omtp.match_id,om.rounds,om.league_id,om.division_id,om.season_id,ol.league_name,od.division_name,os.season_name"). Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds"). Joins("left join org_league as ol on ol.id = om.league_id"). Joins("left join org_division as od on od.id = om.division_id"). Joins("left join org_season as os on os.id = om.season_id"). Scopes( - cDto.PassDel("op"), - cDto.SetWhere("op", "player_id", c.PlayerId), + cDto.PassDel("omtp"), + cDto.SetWhere("omtp", "player_id", c.PlayerId), ). Find(list). Count(count).Error