Skip to content

N
nbya
Commit 851bf0db authored by haoyanbin's avatar haoyanbin
Browse files
Options

1

parent f4300b15
Expand all Show whitespace changes
Inline Side-by-side
Showing with 828 additions and 59 deletions
app/operate/apis/org_team_match.go
View file @ 851bf0db
......@@ -3,10 +3,10 @@ package apis
import (
"fmt"
"strconv"
"strings"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
......@@ -29,8 +29,8 @@ type OrgTeamMatch struct {
// @Router /api/v1/org-team-match [get]
// @Security Bearer
func (e OrgTeamMatch) GetPage(c *gin.Context) {
req := dto.OrgMatchGetPageReq{}
s := service.OrgMatch{}
req := dto.OrgTeamMatchGetPageReq{}
s := service.OrgTeamMatch{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -43,7 +43,7 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
list := make([]dto.OrgMatchGetPageReply, 0)
list := make([]dto.OrgTeamMatchGetPageReply, 0)
var count int64
err = s.GetPage(&req, p, &list, &count)
......@@ -64,8 +64,8 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
// @Router /api/v1/org-team-match/get-players/{id} [get]
// @Security Bearer
func (e OrgTeamMatch) GetPlayers(c *gin.Context) {
req := dto.OrgMatchGetReq{}
s := service.OrgMatch{}
req := dto.OrgPlayerGetPageReq{}
s := service.OrgPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -76,16 +76,21 @@ func (e OrgTeamMatch) GetPlayers(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.OrgMatch
p := actions.GetPermissionFromContext(c)
err = s.Get(strconv.Itoa(req.Id), p, &object)
list := make([]models.OrgPlayer, 0)
var count int64
req.PageIndex = 1
req.PageSize = 999
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛失败，\r\n失败信息 %s", err.Error()))
e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error()))
return
}
e.OK(object, "查询成功")
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
}
// Get <球队>获取比赛已设置球员
......@@ -97,8 +102,8 @@ func (e OrgTeamMatch) GetPlayers(c *gin.Context) {
// @Router /api/v1/org-team-match/get-players-is-set/{id} [get]
// @Security Bearer
func (e OrgTeamMatch) GetPlayersIsSet(c *gin.Context) {
req := dto.OrgMatchGetReq{}
s := service.OrgMatch{}
req := dto.OrgMatchTeamPlayerGetPageReq{}
s := service.OrgMatchTeamPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -109,16 +114,21 @@ func (e OrgTeamMatch) GetPlayersIsSet(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.OrgMatch
p := actions.GetPermissionFromContext(c)
err = s.Get(strconv.Itoa(req.Id), p, &object)
list := make([]models.OrgMatchTeamPlayer, 0)
var count int64
req.PageIndex = 1
req.PageSize = 999
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛失败，\r\n失败信息 %s", err.Error()))
e.Error(500, err, fmt.Sprintf("获取比赛球员数据 失败，\r\n失败信息 %s", err.Error()))
return
}
e.OK(object, "查询成功")
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
}
// Update <球队>修改比赛球员
......@@ -132,7 +142,111 @@ func (e OrgTeamMatch) GetPlayersIsSet(c *gin.Context) {
// @Router /api/v1/org-team-match/update-players/{id} [put]
// @Security Bearer
func (e OrgTeamMatch) UpdatePlayers(c *gin.Context) {
req := dto.OrgMatchUpdateReq{}
req := dto.UpdateOrgMatchTeamPlayerReq{}
s := service.OrgMatchTeamPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
playersIds := strings.Split(req.PlayersIds, ",")
sOrgPlayer := service.OrgPlayer{}
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgPlayer.Service).Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
p := actions.GetPermissionFromContext(c)
teamId := ""
for _, v := range playersIds {
orgPlayer := new(models.OrgPlayer)
id, _ := strconv.Atoi(v)
reqOrgPlayer := new(dto.OrgPlayerGetReq)
reqOrgPlayer.Id = id
_ = sOrgPlayer.Get(reqOrgPlayer, p, orgPlayer)
//if orgPlayer.Id == 0 {
// e.Error(500, err, "球员不存在")
// return
//}
teamId = orgPlayer.TeamId
err, playerId := s.IsBeing(req.MatchId, req.Rounds, v)
if playerId == 0 {
orgMatchPlayer := dto.OrgMatchTeamPlayerInsertReq{
MatchId: req.MatchId,
Rounds: req.Rounds,
ClubId: orgPlayer.ClubId,
TeamId: orgPlayer.TeamId,
OtherTeamId: req.OtherTeamId,
PlayerId: v,
PlayerName: orgPlayer.PlayerName,
PlayerNumber: orgPlayer.PlayerNumber,
Position: orgPlayer.Position,
}
errOrgMatchPlayer := s.Insert(&orgMatchPlayer)
if errOrgMatchPlayer != nil {
e.Error(500, err, fmt.Sprintf("创建比赛球员数据 失败，\r\n失败信息 %s", err.Error()))
return
}
} else {
orgMatchPlayer := dto.OrgMatchTeamPlayerUpdateReq{
Id: playerId,
MatchId: req.MatchId,
Rounds: req.Rounds,
ClubId: orgPlayer.ClubId,
TeamId: orgPlayer.TeamId,
OtherTeamId: req.OtherTeamId,
PlayerId: v,
PlayerName: orgPlayer.PlayerName,
PlayerNumber: orgPlayer.PlayerNumber,
Position: orgPlayer.Position,
}
err = s.Update(&orgMatchPlayer, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("创建比赛球员数据 失败，\r\n失败信息 %s", err.Error()))
return
}
}
}
reqRemovePlayers := new(dto.OrgMatchTeamPlayerDeleteReq)
reqRemovePlayers.MatchId = req.MatchId
reqRemovePlayers.Rounds = req.Rounds
reqRemovePlayers.TeamId = teamId
delPlayerIds := ""
for _, v := range playersIds {
delPlayerIds += "'" + v + "',"
}
delPlayerIds = strings.Trim(delPlayerIds, ",")
reqRemovePlayers.Ids = delPlayerIds
err = s.Remove(reqRemovePlayers, p)
//if err != nil {
// e.Error(500, err, fmt.Sprintf("删除比赛球员数据失败，\r\n失败信息 %s", err.Error()))
// return
//}
e.OK(1, "修改成功")
}
// Get <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
// @Summary <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
// @Description <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
// @Tags <赛事>比赛
// @Param id path string false "id"
// @Success 200 {string} string {data=models.OrgMatchGetInfoReq} "{"code": 200, "data": [...]}"
// @Router /api/v1/org-team-match/info/{id} [get]
// @Security Bearer
func (e OrgTeamMatch) GetInfo(c *gin.Context) {
req := dto.OrgMatchGetInfoReq{}
s := service.OrgMatch{}
err := e.MakeContext(c).
MakeOrm().
......@@ -144,13 +258,94 @@ func (e OrgTeamMatch) UpdatePlayers(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
req.SetUpdateBy(user.GetUserId(c))
var match models.OrgMatch
p := actions.GetPermissionFromContext(c)
err = s.Get(strconv.Itoa(req.Id), p, &match)
if err != nil {
//e.Error(500, err, fmt.Sprintf("获取比赛失败，\r\n失败信息 %s", err.Error()))
//return
}
//联赛级别列表
sOrgLeague := service.OrgLeague{}
listOrgLeague := make([]models.OrgLeague, 0)
var countOrgLeague int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgLeague.Service).Errors
reqOrgLeague := new(dto.OrgLeagueGetPageReq)
reqOrgLeague.PageIndex = 1
reqOrgLeague.PageSize = 999
err = sOrgLeague.GetPage(reqOrgLeague, p, &listOrgLeague, &countOrgLeague)
err = s.Update(&req, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("修改比赛 失败，\r\n失败信息 %s", err.Error()))
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
e.OK(req.GetId(), "修改成功")
//赛季列表
sOrgSeason := service.OrgSeason{}
listOrgSeason := make([]models.OrgSeason, 0)
var countOrgSeason int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgSeason.Service).Errors
reqOrgSeason := new(dto.OrgSeasonGetPageReq)
reqOrgSeason.PageIndex = 1
reqOrgSeason.PageSize = 999
err = sOrgSeason.GetPage(reqOrgSeason, p, &listOrgSeason, &countOrgSeason)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
//赛区列表
sOrgDivision := service.OrgDivision{}
listOrgDivision := make([]models.OrgDivision, 0)
var countOrgDivision int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgDivision.Service).Errors
reqOrgDivision := new(dto.OrgDivisionGetPageReq)
reqOrgDivision.PageIndex = 1
reqOrgDivision.PageSize = 999
err = sOrgDivision.GetPage(reqOrgDivision, p, &listOrgDivision, &countOrgDivision)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
//球队列表
sOrgTeam := service.OrgTeam{}
listOrgTeam := make([]models.OrgTeam, 0)
var countOrgTeam int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors
reqOrgTeam := new(dto.OrgTeamGetPageReq)
reqOrgTeam.PageIndex = 1
reqOrgTeam.PageSize = 999
err = sOrgTeam.GetPage(reqOrgTeam, p, &listOrgTeam, &countOrgTeam)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
reply := dto.OrgMatchGetInfoReply{
OrgMatch: match,
OrgLeagueList: listOrgLeague,
OrgSeasonList: listOrgSeason,
OrgDivisionList: listOrgDivision,
OrgTeamList: listOrgTeam,
}
e.OK(reply, "查询成功")
}
app/operate/apis/org_team_match_evaluate.go
View file @ 851bf0db
......@@ -2,13 +2,14 @@ package apis
import (
"fmt"
cDto "go-admin/common/dto"
"strconv"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
......@@ -64,7 +65,7 @@ func (e OrgTeamMatchEvaluate) GetPage(c *gin.Context) {
// @Router /api/v1/org-team-match-evaluate/get-match [get]
// @Security Bearer
func (e OrgTeamMatchEvaluate) GetPageMatch(c *gin.Context) {
req := dto.OrgMatchEvaluateGetPageReq{}
req := dto.GetPageMatchReq{}
s := service.OrgMatchEvaluate{}
err := e.MakeContext(c).
MakeOrm().
......@@ -78,16 +79,33 @@ func (e OrgTeamMatchEvaluate) GetPageMatch(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
list := make([]dto.OrgMatchEvaluateGetPageReply, 0)
var count int64
reply := new(dto.GetPageMatchReply)
err = s.GetPage(&req, p, &list, &count)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(req.Id, p, replyGetMatchInfo)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.MatchInfo = *replyGetMatchInfo
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, "0", &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
replyGetTotalScoring := make([]cDto.TotalScoring, 0)
err = s.GetTotalScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, replyGetMatchInfo.SeasonId, &replyGetTotalScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.TotalScoring = replyGetTotalScoring
e.OK(reply, "查询成功")
}
// Get <球队>教练评价比赛详情
......@@ -111,16 +129,28 @@ func (e OrgTeamMatchEvaluate) Get(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.OrgMatchEvaluate
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
reply := new(dto.OrgMatchEvaluateGetReply)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(strconv.Itoa(req.Id), p, replyGetMatchInfo)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.MatchInfo = *replyGetMatchInfo
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, strconv.Itoa(req.Id), &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息失败，\r\n失败信息 %s", err.Error()))
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
e.OK(object, "查询成功")
e.OK(reply, "查询成功")
}
// Update <球队>修改评价
......@@ -150,6 +180,7 @@ func (e OrgTeamMatchEvaluate) Update(c *gin.Context) {
p := actions.GetPermissionFromContext(c)
err = s.Update(&req, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("修改比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
......
app/operate/models/org_match_evaluate.go
View file @ 851bf0db
......@@ -13,6 +13,7 @@ type OrgMatchEvaluate struct {
TeamUserId string `json:"teamUserId" gorm:"type:bigint(20);comment:org_team_user表id（教练id）"`
PlayerId string `json:"playerId" gorm:"type:bigint(20);comment:org_player表id（球员id）"`
Content string `json:"content" gorm:"type:text;comment:教练评价内容"`
ContentStatus string `json:"contentStatus" gorm:"type:bigint(20);comment:教练评价状态 1 待评价 2 评价完成"`
WonderfulMomentImg string `json:"wonderfulMomentImg" gorm:"type:varchar(255);comment:精彩时刻图"`
WonderfulMomentMv string `json:"wonderfulMomentMv" gorm:"type:varchar(255);comment:精彩时刻视频"`
WonderfulMomentImgTitle string `json:"wonderfulMomentImgTitle" gorm:"type:varchar(255);comment:精彩时刻图标题"`
......
app/operate/router/org_team_match.go
View file @ 851bf0db
......@@ -20,6 +20,7 @@ func registerOrgTeamMatchRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTM
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)
}
}
app/operate/service/dto/org_match_evaluate.go
View file @ 851bf0db
......@@ -14,6 +14,7 @@ type OrgMatchEvaluateGetPageReq struct {
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:"球员名称"` //球员名称
ContentStatus string `form:"contentStatus" search:"type:exact;column:content_status;table:ome" comment:"教练评价状态 1 待评价 2 评价完成"` //教练评价状态 1 待评价 2 评价完成
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 发布完成
}
......@@ -27,6 +28,7 @@ type OrgMatchEvaluateGetPageReply struct {
PlayerName string `json:"playerName"`
MatchStartTime time.Time `json:"matchStartTimeOrder"`
MatchEndTime time.Time `json:"matchEndTimeOrder"`
ContentStatus string `json:"contentStatus"`
MvStatus string `json:"mvStatus"`
Status string `json:"status"`
}
......@@ -40,28 +42,6 @@ type GetPageMatchReply struct {
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
//ol.league_name, od.division_name, os.season_name, om.rounds, omtp.player_name, om.match_start_time, om.match_end_time, ome.mv_status, ome.status, ome.remark
type OrgMatchEvaluateOrder struct {
Id int `form:"idOrder" search:"type:order;column:id;table:org_match_evaluate"`
MatchId string `form:"matchIdOrder" search:"type:order;column:matchId;table:org_match_evaluate"`
Rounds string `form:"roundsOrder" search:"type:order;column:rounds;table:org_match_evaluate"`
TeamUserId string `form:"teamUserIdOrder" search:"type:order;column:team_user_id;table:org_match_evaluate"`
PlayerId string `form:"playerIdOrder" search:"type:order;column:player_id;table:org_match_evaluate"`
Content string `form:"contentOrder" search:"type:order;column:content;table:org_match_evaluate"`
WonderfulMomentImg string `form:"wonderfulMomentImgOrder" search:"type:order;column:wonderful_moment_img;table:org_match_evaluate"`
WonderfulMomentMv string `form:"wonderfulMomentMvOrder" search:"type:order;column:wonderful_moment_mv;table:org_match_evaluate"`
WonderfulMomentImgTitle string `form:"wonderfulMomentImgTitleOrder" search:"type:order;column:wonderful_moment_img_title;table:org_match_evaluate"`
WonderfulMomentMvTitle string `form:"wonderfulMomentMvTitleOrder" search:"type:order;column:wonderful_moment_mv_title;table:org_match_evaluate"`
MvStatus string `form:"mvStatusOrder" search:"type:order;column:mv_status;table:org_match_evaluate"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_match_evaluate"`
Remark string `form:"remarkOrder" search:"type:order;column:remark;table:org_match_evaluate"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_match_evaluate"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_match_evaluate"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_match_evaluate"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_match_evaluate"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_match_evaluate"`
}
func (m *OrgMatchEvaluateGetPageReq) GetNeedSearch() interface{} {
return *m
}
......@@ -73,6 +53,7 @@ type OrgMatchEvaluateInsertReq struct {
TeamUserId string `json:"teamUserId" comment:"org_team_user表id（教练id）"`
PlayerId string `json:"playerId" comment:"org_player表id（球员id）"`
Content string `json:"content" comment:"教练评价内容"`
ContentStatus string `json:"contentStatus" comment:"教练评价状态 1 待评价 2 评价完成"`
WonderfulMomentImg string `json:"wonderfulMomentImg" comment:"精彩时刻图"`
WonderfulMomentMv string `json:"wonderfulMomentMv" comment:"精彩时刻视频"`
WonderfulMomentImgTitle string `json:"wonderfulMomentImgTitle" comment:"精彩时刻图标题"`
......@@ -112,6 +93,7 @@ type OrgMatchEvaluateUpdateReq struct {
TeamUserId string `json:"teamUserId" comment:"org_team_user表id（教练id）"`
PlayerId string `json:"playerId" comment:"org_player表id（球员id）"`
Content string `json:"content" comment:"教练评价内容"`
ContentStatus string `json:"contentStatus" comment:"教练评价状态 1 待评价 2 评价完成"`
WonderfulMomentImg string `json:"wonderfulMomentImg" comment:"精彩时刻图"`
WonderfulMomentMv string `json:"wonderfulMomentMv" comment:"精彩时刻视频"`
WonderfulMomentImgTitle string `json:"wonderfulMomentImgTitle" comment:"精彩时刻图标题"`
......@@ -131,6 +113,7 @@ func (s *OrgMatchEvaluateUpdateReq) Generate(model *models.OrgMatchEvaluate) {
model.TeamUserId = s.TeamUserId
model.PlayerId = s.PlayerId
model.Content = s.Content
model.ContentStatus = s.ContentStatus
model.WonderfulMomentImg = s.WonderfulMomentImg
model.WonderfulMomentMv = s.WonderfulMomentMv
model.WonderfulMomentImgTitle = s.WonderfulMomentImgTitle
......
app/operate/service/dto/org_team_match.go 0 → 100644
View file @ 851bf0db
package dto
import (
"go-admin/app/operate/models"
"go-admin/common/dto"
"time"
)
type OrgTeamMatchGetPageReq struct {
dto.Pagination `search:"-"`
TeamId string `form:"teamId" search:"type:exact;column:team_id;table:ot" comment:""`
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:om" comment:""`
MatchStartTime string `form:"matchStartTime" search:"type:exact;column:match_start_time;table:om" comment:""`
MatchEndTime string `form:"matchEndTime" search:"type:exact;column:match_end_time;table:om" comment:""`
Status string `form:"status" search:"type:exact;column:status;table:om" comment:""`
}
type OrgTeamMatchGetPageReply struct {
MatchId string `json:"matchId"`
LeagueName string `json:"leagueName"`
SeasonName string `json:"seasonName"`
Rounds string `json:"rounds"`
TeamAName string `json:"teamAName"`
TeamBName string `json:"teamBName"`
MatchStartTime time.Time `json:"matchStartTime"`
MatchEndTime time.Time `json:"matchEndTime"`
Status string `json:"status"`
}
type OrgTeamMatchGetInfoReq struct {
}
type OrgTeamMatchGetInfoReply struct {
OrgMatch models.OrgMatch `form:"orgMatch"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
OrgSeasonList []models.OrgSeason `form:"orgSeasonList"`
OrgDivisionList []models.OrgDivision `form:"orgDivisionList"`
OrgTeamList []models.OrgTeam `form:"orgTeamList"`
}
func (m *OrgTeamMatchGetPageReq) GetNeedSearch() interface{} {
return *m
}
// OrgMatchGetReq 功能获取请求参数
type OrgTeamMatchGetReq struct {
TeamId int `form:"teamId" json:"teamId"`
Rounds int `form:"rounds" json:"rounds"`
}
type OrgTeamMatchGetReply struct {
OrgMatch models.OrgMatch `form:"orgMatch" json:"orgMatch"`
OrgMatchTeamAPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamAPlayer" json:"orgMatchTeamAPlayer"`
OrgMatchTeamBPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamBPlayer" json:"orgMatchTeamBPlayer"`
}
func (s *OrgTeamMatchGetReq) GetId() interface{} {
return s.TeamId
}
app/operate/service/org_team_match.go 0 → 100644
View file @ 851bf0db
package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
)
type OrgTeamMatch struct {
service.Service
}
// GetPage 获取OrgMatch列表
func (e *OrgTeamMatch) GetPage(c *dto.OrgTeamMatchGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamMatchGetPageReply, count *int64) error {
var err error
var data models.OrgMatch
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").
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").
Joins("left join org_team as ota on ota.id = om.team_a_id").
Joins("left join org_team as otb on otb.id = om.team_b_id").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetPage error:%s \r\n", err)
return err
}
return nil
}
// GetPage 获取OrgMatch列表
func (e *OrgTeamMatch) GetPageForTeam(c *dto.OrgMatchGetPageReq, p *actions.DataPermission, list *[]models.OrgMatchTeamPlayer, count *int64) error {
var err error
var data models.OrgMatch
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").
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").
Joins("left join org_team as ota on ota.id = om.team_a_id").
Joins("left join org_team as otb on otb.id = om.team_b_id").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetPage error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatch对象
func (e *OrgTeamMatch) Get(id string, p *actions.DataPermission, model *models.OrgMatch) error {
var data models.OrgMatch
err := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).
First(model, id).Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("Service GetOrgMatch error:%s \r\n", err)
return err
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
app/operate/service/org_team_match_evaluate.go 0 → 100644
View file @ 851bf0db
This diff is collapsed.
app/operate/service/org_team_user.go
View file @ 851bf0db
......@@ -20,14 +20,14 @@ type OrgTeamUser struct {
func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamUserGetPageReply, count *int64) error {
var err error
var data models.OrgTeamUser
field := "oc.club_name, ot.team_name, otu.name, otu.sex, sr.role_name, su.status"
field := "otu.id, oc.club_name, ot.team_name, otu.name, otu.sex, sr.role_name, su.status"
err = e.Orm.Table("org_team_user as otu").
Select(field).
Joins("org_team as ot on otu.team_id=ot.id").
Joins("org_club as oc on otu.club_id=oc.id").
Joins("sys_user as su on otu.user_id=su.user_id").
Joins("sys_role as sr on su.role_id=sr.role_id").
Joins("left join org_team as ot on otu.team_id=ot.id").
Joins("left join org_club as oc on otu.club_id=oc.id").
Joins("left join sys_user as su on otu.user_id=su.user_id").
Joins("left join sys_role as sr on su.role_id=sr.role_id").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment