Player

app/operate/apis/org_match.go

@@ -377,9 +377,11 @@ func (e OrgMatch) GetPlayer(c *gin.Context) {
 // @Summary <赛事>获取比赛已设置球员
 // @Description <赛事>获取比赛已设置球员
 // @Tags <赛事>比赛
-// @Param id path string false "id"
+// @Param teamId path string false "teamId"
+// @Param matchId path string false "matchId"
+// @Param rounds path string false "rounds"
 // @Success 200 {string} string  {data=models.OrgMatch} "{"code": 200, "data": [...]}"
-// @Router /api/v1/org-match/get-player-is-set/{id} [get]
+// @Router /api/v1/org-match/get-player-is-set [get]
 // @Security Bearer
 func (e OrgMatch) GetPlayerIsSet(c *gin.Context) {
 	req := dto.OrgMatchTeamPlayerGetPageReq{}
@@ -525,7 +527,7 @@ func (e OrgMatch) UpdatePlayer(c *gin.Context) {
 // @Product application/json
 // @Param data body dto.OrgMatchTeamPlayerUpdateReq true "body"
 // @Success 200 {string} string  	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/org-match/update-player-data/{id} [put]
+// @Router /api/v1/org-match/update-player-data [put]
 // @Security Bearer
 func (e OrgMatch) UpdatePlayerData(c *gin.Context) {
 	req := dto.OrgMatchTeamPlayerUpdateReq{}

app/operate/apis/org_match_evaluate.go

@@ -23,6 +23,7 @@ type OrgMatchEvaluate struct {
 // @Summary <赛事>赛后评价列表
 // @Description <赛事>赛后评价列表
 // @Tags <赛事>赛后评价
+// @Param data body dto.OrgMatchEvaluateGetPageReq true "body"
 // @Param pageSize query int false "页条数"
 // @Param pageIndex query int false "页码"
 // @Success 200 {string} string  "{"code": 200, "data": [...]}"
@@ -59,8 +60,7 @@ func (e OrgMatchEvaluate) GetPage(c *gin.Context) {
 // @Summary <赛事>赛后评价比赛列表
 // @Description <赛事>赛后评价比赛列表
 // @Tags <赛事>赛后评价
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
+// @Param id path string false "id"
 // @Success 200 {string} string  "{"code": 200, "data": [...]}"
 // @Router /api/v1/org-match-evaluate/get-match [get]
 // @Security Bearer

app/operate/apis/org_team_match_evaluate.go

@@ -96,7 +96,7 @@ func (e OrgTeamMatchEvaluate) GetPageMatch(c *gin.Context) {
 // @Tags <球队>教练评价
 // @Param id path string false "id"
 // @Success 200 {string} string  "{"code": 200, "data": [...]}"
-// @Router /api/v1/org-match-evaluate/{id} [get]
+// @Router /api/v1/org-team-match-evaluate/{id} [get]
 // @Security Bearer
 func (e OrgTeamMatchEvaluate) Get(c *gin.Context) {
 	req := dto.OrgMatchEvaluateGetReq{}
@@ -131,7 +131,7 @@ func (e OrgTeamMatchEvaluate) Get(c *gin.Context) {
 // @Product application/json
 // @Param data body dto.OrgMatchEvaluateUpdateReq true "body"
 // @Success 200 {string} string  	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/org-match-evaluate/{id} [put]
+// @Router /api/v1/org-team-match-evaluate/{id} [put]
 // @Security Bearer
 func (e OrgTeamMatchEvaluate) Update(c *gin.Context) {
 	req := dto.OrgMatchEvaluateUpdateReq{}

app/operate/router/org_match.go

@@ -24,8 +24,8 @@ func registerOrgMatchRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddl
 		r.PUT("/:id", api.Update)
 		r.DELETE("", api.Delete)
 		r.GET("/get-player", api.GetPlayer)
-		r.GET("/get-player-is-set/:id", api.GetPlayerIsSet)
-		r.PUT("/update-player/:id", api.UpdatePlayer)
-		r.PUT("/update-player-data/:id", api.UpdatePlayerData)
+		r.GET("/get-player-is-set", api.GetPlayerIsSet)
+		r.PUT("/update-player", api.UpdatePlayer)
+		r.PUT("/update-player-data", api.UpdatePlayerData)
 	}
 }

app/operate/service/dto/org_match_evaluate.go

@@ -9,14 +9,13 @@ import (
 
 type OrgMatchEvaluateGetPageReq struct {
 	dto.Pagination `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:""`
-	Rounds         string `form:"rounds"  search:"type:exact;column:rounds;table:omtp" comment:""`
-	PlayerName     string `form:"playerName"  search:"type:exact;column:player_name;table:omtp" comment:""`
-	MvStatus       string `form:"mvStatus"  search:"type:exact;column:mv_status;table:ome" comment:"视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成"`
-	Status         string `form:"status"  search:"type:exact;column:status;table:ome" comment:"发布状态 1 待审核 3 驳回 4 发布完成"`
-	OrgMatchEvaluateOrder
+	LeagueId       string `form:"leagueId"  search:"type:exact;column:league_id;table:om" comment:"联赛级别id"`                           //联赛级别id
+	DivisionId     string `form:"divisionId"  search:"type:exact;column:division_id;table:om" comment:"赛区id"`                         //赛区id
+	SeasonId       string `form:"seasonId"  search:"type:exact;column:season_id;table:om" comment:"赛季id"`                             //赛季id
+	Rounds         string `form:"rounds"  search:"type:exact;column:rounds;table:omtp" comment:"轮次"`                                  //轮次
+	PlayerName     string `form:"playerName"  search:"type:contains;column:player_name;table:omtp" comment:"球员名称"`                    //球员名称
+	MvStatus       string `form:"mvStatus"  search:"type:exact;column:mv_status;table:ome" comment:"视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成"` //视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成
+	Status         string `form:"status"  search:"type:exact;column:status;table:ome" comment:"发布状态 0 保存 1 待审核 3 驳回 4 发布完成"`          //发布状态 0 保存 1 待审核 3 驳回 4 发布完成
 }
 
 type OrgMatchEvaluateGetPageReply struct {

app/operate/service/dto/org_match_team_player.go

@@ -9,7 +9,9 @@ import (
 
 type OrgMatchTeamPlayerGetPageReq struct {
 	dto.Pagination `search:"-"`
-	OrgMatchTeamPlayerOrder
+	TeamId         string `form:"teamId"  search:"type:exact;column:team_id;table:org_match_team_player" comment:""`
+	MatchId        string `form:"matchId"  search:"type:exact;column:match_id;table:org_match_team_player" comment:""`
+	Rounds         string `form:"rounds"  search:"type:exact;column:rounds;table:org_match_team_player" comment:""`
 }
 type UpdateOrgMatchTeamPlayerReq struct {
 	MatchId     string `json:"matchId"`

app/operate/service/dto/org_player.go

@@ -10,7 +10,6 @@ import (
 type OrgPlayerGetPageReq struct {
 	dto.Pagination `search:"-"`
 	TeamId         string `form:"teamId"  search:"type:exact;column:team_id;table:org_player" comment:""`
-	OrgPlayerOrder
 }
 
 type OrgPlayerOrder struct {

app/operate/service/org_match_team_player.go

@@ -28,6 +28,7 @@ func (e *OrgMatchTeamPlayer) GetPage(c *dto.OrgMatchTeamPlayerGetPageReq, p *act
 			actions.Permission(data.TableName(), p),
 			cDto.SetWhere("", "team_id", c.TeamId),
 			cDto.SetWhere("", "match_id", c.MatchId),
+			cDto.SetWhere("", "rounds", c.Rounds),
 		).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error