team_match

app/operate/apis/org_match.go

@@ -436,6 +436,13 @@ func (e OrgMatch) UpdatePlayer(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
+
+	if req.MatchId == "" || req.Rounds == "" || req.OtherTeamId == "" {
+		e.Logger.Error(err)
+		e.Error(500, err, "数据有误，请重新提交")
+		return
+	}
+
 	playersIds := strings.Split(req.PlayersIds, ",")
 
 	sOrgPlayer := service.OrgPlayer{}

app/operate/apis/org_team_match.go

@@ -2,6 +2,7 @@ package apis
 
 import (
 	"fmt"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	"strconv"
 	"strings"
 
@@ -42,16 +43,31 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
 		return
 	}
 
+	sOrgTeamUser := service.OrgTeamUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
+	_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
+
 	p := actions.GetPermissionFromContext(c)
 	list := make([]dto.OrgTeamMatchGetPageReply, 0)
 	var count int64
 
+	req.TeamId = teamId
+
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
 		e.Error(500, err, fmt.Sprintf("获取比赛 失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
 
+	for k, v := range list {
+		if v.TeamAId == teamId {
+			list[k].OwnTeam = "a"
+		}
+		if v.TeamBId == teamId {
+			list[k].OwnTeam = "b"
+		}
+	}
+
 	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 }
 
@@ -61,7 +77,7 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
 // @Tags <球队>比赛
 // @Param id path string false "id"
 // @Success 200 {string} string  {data=models.OrgMatch} "{"code": 200, "data": [...]}"
-// @Router /api/v1/org-team-match/get-players/{id} [get]
+// @Router /api/v1/org-team-match/get-players [get]
 // @Security Bearer
 func (e OrgTeamMatch) GetPlayers(c *gin.Context) {
 	req := dto.OrgPlayerGetPageReq{}
@@ -99,7 +115,7 @@ func (e OrgTeamMatch) GetPlayers(c *gin.Context) {
 // @Tags <球队>比赛
 // @Param id path string false "id"
 // @Success 200 {string} string  {data=models.OrgMatch} "{"code": 200, "data": [...]}"
-// @Router /api/v1/org-team-match/get-players-is-set/{id} [get]
+// @Router /api/v1/org-team-match/get-players-is-set [get]
 // @Security Bearer
 func (e OrgTeamMatch) GetPlayersIsSet(c *gin.Context) {
 	req := dto.OrgMatchTeamPlayerGetPageReq{}
@@ -139,7 +155,7 @@ func (e OrgTeamMatch) GetPlayersIsSet(c *gin.Context) {
 // @Product application/json
 // @Param data body dto.OrgMatchUpdateReq true "body"
 // @Success 200 {string} string  	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/org-team-match/update-players/{id} [put]
+// @Router /api/v1/org-team-match/update-players [put]
 // @Security Bearer
 func (e OrgTeamMatch) UpdatePlayers(c *gin.Context) {
 	req := dto.UpdateOrgMatchTeamPlayerReq{}
@@ -154,6 +170,13 @@ func (e OrgTeamMatch) UpdatePlayers(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
+
+	if req.MatchId == "" || req.Rounds == "" || req.OtherTeamId == "" {
+		e.Logger.Error(err)
+		e.Error(500, err, "数据有误，请重新提交")
+		return
+	}
+
 	playersIds := strings.Split(req.PlayersIds, ",")
 
 	sOrgPlayer := service.OrgPlayer{}

app/operate/router/org_team_match.go

@@ -18,9 +18,9 @@ func registerOrgTeamMatchRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTM
 	r := v1.Group("/org-team-match").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
 		r.GET("", api.GetPage)
-		r.GET("/get-players/:id", api.GetPlayers)
-		r.GET("/get-players-is-set/:id", api.GetPlayersIsSet)
-		r.GET("/info/:id", api.GetInfo)
-		r.PUT("/update-players/:id", api.UpdatePlayers)
+		r.GET("/get-players", api.GetPlayers)
+		r.GET("/get-players-is-set", api.GetPlayersIsSet)
+		r.GET("/info", api.GetInfo)
+		r.PUT("/update-players", api.UpdatePlayers)
 	}
 }

app/operate/service/dto/org_match.go

@@ -29,6 +29,8 @@ type OrgMatchGetPageReply struct {
 	Grouping       string    `json:"grouping"`
 	TeamAName      string    `json:"team_a_name"`
 	TeamBName      string    `json:"team_b_name"`
+	TeamAId        string    `json:"teamAId"`
+	TeamBId        string    `json:"teamBId"`
 	MatchStartTime time.Time `json:"matchStartTimeOrder"`
 	MatchEndTime   time.Time `json:"matchEndTimeOrder"`
 	Status         string    `json:"status"`

app/operate/service/dto/org_player.go

@@ -10,7 +10,7 @@ import (
 
 type OrgPlayerGetPageReq struct {
 	dto.Pagination `search:"-"`
-	TeamId         string `form:"teamId"  search:"type:contains;column:team_id;table:ot" comment:""`
+	TeamId         string `form:"teamId"  search:"-"`
 	TeamName       string `form:"teamName"  search:"type:contains;column:team_name;table:ot" comment:""`
 	PlayerName     string `form:"playerName"  search:"type:contains;column:player_name;table:op" comment:""`
 	Status         string `form:"status"  search:"type:exact;column:status;table:op" comment:""`

app/operate/service/dto/org_team_match.go

@@ -8,7 +8,7 @@ import (
 
 type OrgTeamMatchGetPageReq struct {
 	dto.Pagination `search:"-"`
-	TeamId         string `form:"teamId"  search:"type:exact;column:team_id;table:ot" comment:""`
+	TeamId         string `form:"teamId" search:"-"`
 	LeagueId       string `form:"leagueId"  search:"type:exact;column:league_id;table:om" comment:""`
 	DivisionId     string `form:"divisionId"  search:"type:exact;column:division_id;table:om" comment:""`
 	SeasonId       string `form:"seasonId"  search:"type:exact;column:season_id;table:om" comment:""`
@@ -19,15 +19,19 @@ type OrgTeamMatchGetPageReq struct {
 }
 
 type OrgTeamMatchGetPageReply struct {
-	MatchId        string    `json:"matchId"`
+	Id             string    `json:"id"`
 	LeagueName     string    `json:"leagueName"`
 	SeasonName     string    `json:"seasonName"`
 	Rounds         string    `json:"rounds"`
+	TeamId         string    `json:"teamId"`
 	TeamAName      string    `json:"teamAName"`
 	TeamBName      string    `json:"teamBName"`
+	TeamAId        string    `json:"teamAId"`
+	TeamBId        string    `json:"teamBId"`
 	MatchStartTime time.Time `json:"matchStartTime"`
 	MatchEndTime   time.Time `json:"matchEndTime"`
 	Status         string    `json:"status"`
+	OwnTeam        string    `json:"own_team"`
 }
 
 type OrgTeamMatchGetInfoReq struct {

app/operate/service/org_match.go

@@ -24,7 +24,7 @@ func (e *OrgMatch) GetPage(c *dto.OrgMatchGetPageReq, p *actions.DataPermission,
 	err = e.Orm.Table("org_match as om").
 		Select("om.id, ol.league_name, od.division_name, os.season_name,om.grouping,"+
 			"om.rounds, om.match_start_time, om.match_end_time, om.status,"+
-			"ota.team_name as team_a_name, otb.team_name as team_b_name").
+			"ota.team_name as team_a_name, om.team_a_id,om.team_b_id, otb.team_name as team_b_name").
 		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").

app/operate/service/org_team_match.go

@@ -24,7 +24,7 @@ func (e *OrgTeamMatch) GetPage(c *dto.OrgTeamMatchGetPageReq, p *actions.DataPer
 	err = e.Orm.Table("org_match as om").
 		Select("om.id, ol.league_name, od.division_name, os.season_name,om.grouping,"+
 			"om.rounds, om.match_start_time, om.match_end_time, om.status,"+
-			"ota.team_name as team_a_name, otb.team_name as team_b_name").
+			"ota.team_name as team_a_name, om.team_a_id, om.team_b_id, otb.team_name as team_b_name").
 		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").
@@ -36,6 +36,7 @@ func (e *OrgTeamMatch) GetPage(c *dto.OrgTeamMatchGetPageReq, p *actions.DataPer
 			actions.Permission(data.TableName(), p),
 			cDto.PassDel("om"),
 		).
+		Where("team_a_id = ? or team_b_id = ?", c.TeamId, c.TeamId).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {

app/operate/service/org_team_user.go

@@ -137,3 +137,18 @@ func (e *OrgTeamUser) GetUserId(ids []int) (error, []int) {
 	}
 	return nil, userIds
 }
+
+// Get 获取OrgClubUser对象
+func (e *OrgTeamUser) GetTeamId(userId int) (error, string) {
+	data := new(models.OrgTeamUser)
+
+	err := e.Orm.Table("org_team_user").
+		Select("team_id").
+		Where("user_id=?", userId).
+		First(&data).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err, ""
+	}
+	return nil, data.TeamId
+}