Rank

app/mobile/apis/org_player_rank.go

@@ -29,9 +29,9 @@ type OrgPlayerRank struct {
 func (e OrgPlayerRank) GetPage(c *gin.Context) {
 	req := dto.OrgPlayerRankGetPageReq{}
 	s := service.OrgPlayerRank{}
-	err := e.MakeContext(c).
+	err := c.Bind(&req)
+	err = e.MakeContext(c).
 		MakeOrm().
-		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -50,7 +50,23 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) {
 		return
 	}
 
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+	listOwn := dto.OrgPlayerRankGetPageReply{}
+	var countOwn int64
+	reqOwn := dto.OrgPlayerRankGetPageReq{}
+	reqOwn.TypeName = req.TypeName
+	reqOwn.PlayerId = req.PlayerId
+	reqOwn.PageSize = 9999
+	err = s.GetPageOwn(&reqOwn, p, &listOwn, &countOwn)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取球队 失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	reply := dto.OrgPlayerRankAllData{}
+	reply.OwnData = listOwn
+	reply.AllData = list
+
+	e.PageOK(reply, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 }
 
 // GetPage <手机端>获取球队排名
@@ -112,6 +128,11 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
 		return
 	}
 
+	//获取赛季id
+	sPlayer := service.OrgPlayer{}
+	e.MakeContext(c).MakeOrm().MakeService(&sPlayer.Service)
+	req.SeasonId = sPlayer.GetNowSeasonId()
+
 	reply := dto.OrgPlayerRankInfoGetReply{}
 
 	//获取基本信息

app/mobile/service/dto/org_player_rank.go

@@ -6,6 +6,7 @@ import (
 
 type OrgPlayerRankGetPageReq struct {
 	dto.Pagination `search:"-"`
+	PlayerId       string `form:"playerId"  search:"-"`                                                     //id
 	LeagueId       string `form:"leagueId"  search:"type:exact;column:league_id;table:om" comment:"联赛级别id"` //联赛级别id
 	TypeName       string `form:"typeName"  search:"-"`                                                     //
 }
@@ -25,6 +26,11 @@ type OrgPlayerRankGetPageReply struct {
 	dto.TotalScoring
 }
 
+type OrgPlayerRankAllData struct {
+	OwnData OrgPlayerRankGetPageReply   `json:"ownData"`
+	AllData []OrgPlayerRankGetPageReply `json:"allData"`
+}
+
 type OrgPlayerRankInfoGetReq struct {
 	dto.Pagination `search:"-"`
 	LeagueId       string `form:"leagueId"  search:"type:exact;column:league_id;table:om" comment:"联赛级别id"` //联赛级别id

app/mobile/service/org_player_rank.go

@@ -79,6 +79,97 @@ func (e *OrgPlayerRank) GetPage(c *dto.OrgPlayerRankGetPageReq, p *actions.DataP
 	return nil
 }
 
+// GetPage 获取OrgMatchEvaluate列表
+func (e *OrgPlayerRank) GetPageOwn(c *dto.OrgPlayerRankGetPageReq, p *actions.DataPermission, data *dto.OrgPlayerRankGetPageReply, count *int64) error {
+	var err error
+
+	list := make([]dto.OrgPlayerRankGetPageReply, 0)
+
+	err = e.Orm.Table("org_match_team_player as omtp").
+		Select("omtp.player_id as id, omtp.player_name, omtp.player_number,"+
+			"ol.league_name, oc.club_name, oc.club_logo, oc.club_qrcode,"+
+			"sum(omtp.scoring)as scoring,"+
+			"sum(omtp.rebound)as rebound,"+
+			"sum(omtp.assist)as assist,"+
+			"sum(omtp.steal)as steal,"+
+			"sum(omtp.free_throw)as free_throw,"+
+			"sum(omtp.block_shot)as block_shot,"+
+			"sum(omtp.foul)as foul,"+
+			"sum(omtp.two_point_shot)as two_point_shot,"+
+			"sum(omtp.three_point_shot)as three_point_shot").
+		Joins("left join org_team as ot on ot.id = omtp.team_id").
+		Joins("left join org_club as oc on oc.id = omtp.club_id").
+		Joins("left join org_player as op on op.id = omtp.player_id").
+		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").
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission("omtp", p),
+			cDto.PassDel("omtp"),
+			cDto.SetWhere("om", "league_id", c.LeagueId),
+		).
+		Group("omtp.player_id").
+		Find(&list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		e.Log.Errorf("OrgClubPlayer GetPage error:%s \r\n", err)
+		return err
+	}
+
+	if c.TypeName == "scoring" {
+		e.rankingScoring(&list)
+	}
+	if c.TypeName == "rebound" {
+		e.rankingRebound(&list)
+	}
+	if c.TypeName == "assist" {
+		e.rankingAssist(&list)
+	}
+	if c.TypeName == "steal" {
+		e.rankingSteal(&list)
+	}
+	if c.TypeName == "freeThrow" {
+		e.rankingFreeThrow(&list)
+	}
+	if c.TypeName == "blockShot" {
+		e.rankingBlockShot(&list)
+	}
+	if c.TypeName == "foul" {
+		e.rankingFoul(&list)
+	}
+	if c.TypeName == "twoPointShot" {
+		e.rankingTwoPointShot(&list)
+	}
+	if c.TypeName == "threePointShot" {
+		e.rankingThreePointShot(&list)
+	}
+
+	for _, v := range list {
+		if v.Id == c.PlayerId {
+			data.Id = v.Id
+			data.ClubLogo = v.ClubLogo
+			data.ClubName = v.ClubName
+			data.PlayerImg = v.PlayerImg
+			data.PlayerName = v.PlayerName
+			data.PlayerNumber = v.PlayerNumber
+			data.Position = v.Position
+			data.Rank = v.Rank
+			data.Scoring = v.Scoring
+			data.Rebound = v.Rebound
+			data.Assist = v.Assist
+			data.Steal = v.Steal
+			data.FreeThrow = v.FreeThrow
+			data.BlockShot = v.BlockShot
+			data.Foul = v.Foul
+			data.TwoPointShot = v.TwoPointShot
+			data.ThreePointShot = v.ThreePointShot
+		}
+	}
+
+	return nil
+}
+
 // GetPage 获取OrgMatchEvaluate列表
 func (e *OrgPlayerRank) GetPageTeam(c *dto.OrgPlayerRankGetPageReq, p *actions.DataPermission, list *[]dto.OrgPlayerRankGetPageReply, count *int64) error {
 	var err error