From 783f43c8145c0e0af9f47033ca3c515bda6d5b66 Mon Sep 17 00:00:00 2001
From: haoyanbin <605649647@qq.com>
Date: Wed, 26 Jan 2022 16:29:24 +0800
Subject: [PATCH] countMatch
---
app/mobile/service/dto/org_player.go | 18 +-----------------
app/mobile/service/org_player.go | 12 ++----------
2 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/app/mobile/service/dto/org_player.go b/app/mobile/service/dto/org_player.go
index 75d208f..baf15b2 100755
--- a/app/mobile/service/dto/org_player.go
+++ b/app/mobile/service/dto/org_player.go
@@ -79,28 +79,12 @@ type OrgPlayerGetInfoReply struct {
RoundsScoring []OrgPlayerRoundsScoring `json:"roundsScoring"`
}
-type DataAvg struct {
- //ScoringAvg string `json:"scoringAvg" comment:"寰楀垎"`
- //ReboundAvg string `json:"reboundAvg" comment:"绡澘"`
- //AssistAvg string `json:"assistAvg" comment:"鍔╂敾"`
- //StealAvg string `json:"stealAvg" comment:"鎶㈡柇"`
- //FreeThrowAvg string `json:"freeThrowAvg" comment:"缃氱悆"`
- //BlockShotAvg string `json:"blockShotAvg" comment:"鐩栧附"`
- //FoulAvg string `json:"foulAvg" comment:"鐘"`
- //TwoPointShotAvg string `json:"twoPointShotAvg" comment:"2鍒嗚繘鐞冩暟閲�"`
- //ThreePointShotAvg string `json:"threePointShotAvg" comment:"3鍒嗚繘鐞冩暟閲�"`
- Scoring string `json:"scoring" comment:"寰楀垎"`
- Rebound string `json:"rebound" comment:"绡澘"`
- Assist string `json:"assist" comment:"鍔╂敾"`
- Steal string `json:"steal" comment:"鎶㈡柇"`
- BlockShot string `json:"blockShot" comment:"鐩栧附"`
-}
-
type OrgMatchInfo struct {
Id string `json:"id"`
SeasonId string `json:"seasonId" comment:"璧涘id"`
SeasonName string `json:"seasonName" comment:"璧涘鍚嶇О"`
LeagueName string `json:"leagueName" comment:"鑱旇禌绾у埆"`
+ CountMatch string `json:"countMatch" comment:"鍦烘"`
dto.TotalScoring
}
diff --git a/app/mobile/service/org_player.go b/app/mobile/service/org_player.go
index 3ba661b..2a9d250 100755
--- a/app/mobile/service/org_player.go
+++ b/app/mobile/service/org_player.go
@@ -165,7 +165,7 @@ func (e *OrgPlayer) StatisticsScoringAvg(playerId string, seasonId string, stati
var err error
field := ""
- field += "omtp.id, ol.league_name, os.season_name, om.season_id," +
+ field += "omtp.id, ol.league_name, os.season_name, om.season_id, count(omtp.id)as count_match," +
"sum(omtp.scoring)as scoring," +
"sum(omtp.rebound)as rebound," +
"sum(omtp.assist)as assist," +
@@ -187,15 +187,7 @@ func (e *OrgPlayer) StatisticsScoringAvg(playerId string, seasonId string, stati
First(data).Error
if statistics == "avg" {
- var teamCount int64 = 0
- err = e.Orm.Table("org_match_team_player as omtp").
- Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
- Select(field).
- Scopes(
- cDto.SetWhere("om", "season_id", seasonId),
- cDto.SetWhere("omtp", "player_id", playerId),
- ).
- Count(&teamCount).Error
+ teamCount, _ := strconv.ParseInt(data.CountMatch, 10, 64)
data.Scoring = utils.GetAvg(data.Scoring, teamCount)
data.Rebound = utils.GetAvg(data.Rebound, teamCount)
--
2.18.1