1

app/admin/models/sys_user.go

@@ -11,6 +11,7 @@ type SysUser struct {
 	Username   string   `json:"username" gorm:"size:64;comment:用户名"`
 	Password   string   `json:"-" gorm:"size:128;comment:密码"`
 	NickName   string   `json:"nickName" gorm:"size:128;comment:昵称"`
+	NickNameEn string   `json:"nickNameEn" gorm:"size:128;comment:昵称"`
 	Phone      string   `json:"phone" gorm:"size:11;comment:手机号"`
 	RoleId     int      `json:"roleId" gorm:"size:20;comment:角色ID"`
 	Salt       string   `json:"-" gorm:"size:255;comment:加盐"`

app/admin/service/dto/sys_user.go

@@ -93,6 +93,7 @@ type SysUserInsertReq struct {
 	Username   string `json:"username" comment:"用户名" vd:"len($)>0"`
 	Password   string `json:"password" comment:"密码"`
 	NickName   string `json:"nickName" comment:"昵称" vd:"len($)>0"`
+	NickNameEn string `json:"nickNameEn" comment:"昵称" vd:"len($)>0"`
 	Phone      string `json:"phone" comment:"手机号" vd:"len($)>0"`
 	RoleId     int    `json:"roleId" comment:"角色ID"`
 	Avatar     string `json:"avatar" comment:"头像"`
@@ -131,6 +132,7 @@ type SysUserUpdateReq struct {
 	UserId     int    `json:"userId" comment:"用户ID"` // 用户ID
 	Username   string `json:"username" comment:"用户名" vd:"len($)>0"`
 	NickName   string `json:"nickName" comment:"昵称" vd:"len($)>0"`
+	NickNameEn string `json:"nickNameEn" comment:"昵称" vd:"len($)>0"`
 	Phone      string `json:"phone" comment:"手机号" vd:"len($)>0"`
 	RoleId     int    `json:"roleId" comment:"角色ID"`
 	Avatar     string `json:"avatar" comment:"头像"`
@@ -149,6 +151,7 @@ func (s *SysUserUpdateReq) Generate(model *models.SysUser) {
 	}
 	model.Username = s.Username
 	model.NickName = s.NickName
+	model.NickNameEn = s.NickNameEn
 	model.Phone = s.Phone
 	model.RoleId = s.RoleId
 	model.Avatar = s.Avatar

app/operate/apis/org_club.go

@@ -2,12 +2,15 @@ package apis
 
 import (
 	"fmt"
+	"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"
 
+	sService "go-admin/app/admin/service"
+	sDto "go-admin/app/admin/service/dto"
 	"go-admin/app/operate/models"
 	"go-admin/app/operate/service"
 	"go-admin/app/operate/service/dto"
@@ -84,7 +87,7 @@ func (e OrgClub) Get(c *gin.Context) {
 		return
 	}
 
-	e.OK( object, "查询成功")
+	e.OK(object, "查询成功")
 }
 
 // Insert <俱乐部>创建俱乐部
@@ -119,6 +122,56 @@ func (e OrgClub) Insert(c *gin.Context) {
 		return
 	}
 
+	sSysUser := sService.SysUser{}
+	reqSysUser := sDto.SysUserInsertReq{}
+	reqSysUser.Username = req.ClubUserName
+	reqSysUser.Password = "123456"
+	reqSysUser.NickName = req.ClubContacts
+	reqSysUser.NickNameEn = req.ClubContactsEn
+	reqSysUser.Phone = req.ClubMobile
+	reqSysUser.RoleId = 1
+	reqSysUser.Avatar = ""
+	reqSysUser.Sex = "0"
+	reqSysUser.Email = ""
+	reqSysUser.DeptId = 1
+	reqSysUser.PostId = 1
+	reqSysUser.Remark = "俱乐部"
+	reqSysUser.Status = "2"
+
+	// 设置创建人
+	reqSysUser.SetCreateBy(user.GetUserId(c))
+	err = sSysUser.Insert(&reqSysUser)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	//关联表添加
+	reqClubUser := dto.OrgClubUserInsertReq{}
+	sClubUser := service.OrgClubUser{}
+	errClubUser := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if errClubUser != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	reqClubUser.UserId = strconv.Itoa(reqSysUser.GetId().(int))
+	reqClubUser.ClubId = strconv.Itoa(req.GetId().(int))
+	// 设置创建人
+	reqClubUser.SetCreateBy(user.GetUserId(c))
+
+	err = sClubUser.Insert(&reqClubUser)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("创建俱乐部  失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
 	e.OK(req.GetId(), "创建成功")
 }
 
@@ -153,7 +206,24 @@ func (e OrgClub) Update(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("修改俱乐部 失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
-	e.OK( req.GetId(), "修改成功")
+
+	sSysUser := sService.SysUser{}
+	reqSysUser := sDto.SysUserUpdateReq{}
+	reqSysUser.Username = req.ClubUserName
+	reqSysUser.NickName = req.ClubContacts
+	reqSysUser.NickNameEn = req.ClubContactsEn
+	reqSysUser.Phone = req.ClubMobile
+
+	// 设置创建人
+	reqSysUser.SetCreateBy(user.GetUserId(c))
+	err = sSysUser.Update(&reqSysUser, p)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	e.OK(req.GetId(), "修改成功")
 }
 
 // Delete <俱乐部>删除俱乐部
@@ -186,5 +256,20 @@ func (e OrgClub) Delete(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("删除俱乐部失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
-	e.OK( req.GetId(), "删除成功")
+
+	sOrgClubUser := service.OrgClubUser{}
+	_, userId := sOrgClubUser.GetUserId(req.GetId().(int))
+
+	sSysUser := sService.SysUser{}
+	reqSysUser := sDto.SysUserById{}
+	reqSysUser.Id, _ = strconv.Atoi(userId)
+	// 设置编辑人
+	reqSysUser.SetUpdateBy(user.GetUserId(c))
+
+	err = sSysUser.Remove(&reqSysUser, p)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
 }

app/operate/apis/org_club_player.go

@@ -2,12 +2,13 @@ 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/response"
 
-	"go-admin/app/operate/models"
 	"go-admin/app/operate/service"
 	"go-admin/app/operate/service/dto"
 	"go-admin/common/actions"
@@ -27,8 +28,8 @@ type OrgClubPlayer struct {
 // @Router /api/v1/org-player [get]
 // @Security Bearer
 func (e OrgClubPlayer) GetPage(c *gin.Context) {
-    req := dto.OrgPlayerGetPageReq{}
-    s := service.OrgPlayer{}
+	req := dto.OrgClubPlayerGetPageReq{}
+	s := service.OrgClubPlayer{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -41,12 +42,12 @@ func (e OrgClubPlayer) GetPage(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgPlayer, 0)
+	list := make([]dto.OrgClubPlayerGetPageReply, 0)
 	var count int64
 
 	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
 	}
 
@@ -60,11 +61,11 @@ func (e OrgClubPlayer) GetPage(c *gin.Context) {
 // @Param pageSize query int false "页条数"
 // @Param pageIndex query int false "页码"
 // @Success 200 {string} string  "{"code": 200, "data": [...]}"
-// @Router /api/v1/org-player/get-match [get]
+// @Router /api/v1/org-club-player/get-match [get]
 // @Security Bearer
 func (e OrgClubPlayer) GetPageMatch(c *gin.Context) {
-	req := dto.OrgPlayerGetPageReq{}
-	s := service.OrgPlayer{}
+	req := dto.GetPageMatchClubPlayerReq{}
+	s := service.OrgClubPlayer{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -77,16 +78,33 @@ func (e OrgClubPlayer) GetPageMatch(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgPlayer, 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()))
+		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 <俱乐部>获取球员比赛详情
@@ -95,11 +113,11 @@ func (e OrgClubPlayer) GetPageMatch(c *gin.Context) {
 // @Tags <俱乐部>球员
 // @Param id path string false "id"
 // @Success 200 {string} string  "{"code": 200, "data": [...]}"
-// @Router /api/v1/org-player/{id} [get]
+// @Router /api/v1/org-club-player/get [get]
 // @Security Bearer
 func (e OrgClubPlayer) Get(c *gin.Context) {
-	req := dto.OrgPlayerGetReq{}
-	s := service.OrgPlayer{}
+	req := dto.OrgClubPlayerGetReq{}
+	s := service.OrgClubPlayer{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -110,14 +128,26 @@ func (e OrgClubPlayer) Get(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
-	var object models.OrgPlayer
 
 	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, "查询成功")
 }

app/operate/apis/org_club_team.go

@@ -2,12 +2,14 @@ package apis
 
 import (
 	"fmt"
+	"go-admin/app/operate/models"
+	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/response"
 
-	"go-admin/app/operate/models"
 	"go-admin/app/operate/service"
 	"go-admin/app/operate/service/dto"
 	"go-admin/common/actions"
@@ -27,8 +29,8 @@ type OrgClubTeam struct {
 // @Router /api/v1/org-club-team [get]
 // @Security Bearer
 func (e OrgClubTeam) GetPage(c *gin.Context) {
-    req := dto.OrgTeamGetPageReq{}
-    s := service.OrgTeam{}
+	req := dto.OrgClubTeamGetPageReq{}
+	s := service.OrgClubTeam{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -41,7 +43,7 @@ func (e OrgClubTeam) GetPage(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgTeam, 0)
+	list := make([]dto.OrgClubTeamGetPageReply, 0)
 	var count int64
 
 	err = s.GetPage(&req, p, &list, &count)
@@ -63,8 +65,8 @@ func (e OrgClubTeam) GetPage(c *gin.Context) {
 // @Router /api/v1/org-club-team/get-match [get]
 // @Security Bearer
 func (e OrgClubTeam) GetPageMatch(c *gin.Context) {
-	req := dto.OrgTeamGetPageReq{}
-	s := service.OrgTeam{}
+	req := dto.GetPageMatchClubTeamReq{}
+	s := service.OrgClubTeam{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -77,16 +79,33 @@ func (e OrgClubTeam) GetPageMatch(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgTeam, 0)
-	var count int64
+	reply := new(dto.GetPageMatchReply)
 
-	err = s.GetPage(&req, p, &list, &count)
+	replyGetMatchInfo := new(cDto.PageMatchInfo)
+	err = s.GetMatchInfo(strconv.Itoa(req.TeamId), p, replyGetMatchInfo)
 	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.MatchInfo = *replyGetMatchInfo
 
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+	replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
+	err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, &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 <俱乐部>获取球队比赛详情
@@ -95,11 +114,11 @@ func (e OrgClubTeam) GetPageMatch(c *gin.Context) {
 // @Tags <俱乐部>球队
 // @Param id path string false "id"
 // @Success 200 {string} string  "{"code": 200, "data": [...]}"
-// @Router /api/v1/org-club-team/{id} [get]
+// @Router /api/v1/org-club-team/get [get]
 // @Security Bearer
 func (e OrgClubTeam) Get(c *gin.Context) {
-	req := dto.OrgTeamGetReq{}
-	s := service.OrgTeam{}
+	req := dto.OrgClubTeamGetReq{}
+	s := service.OrgClubTeam{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -110,14 +129,132 @@ func (e OrgClubTeam) Get(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
-	var object models.OrgTeam
 
 	p := actions.GetPermissionFromContext(c)
-	err = s.Get(&req, p, &object)
+
+	reply := new(dto.OrgMatchEvaluateGetReply)
+
+	replyGetMatchInfo := new(cDto.PageMatchInfo)
+	err = s.GetMatchInfo(strconv.Itoa(req.TeamId), 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.TeamId, replyGetMatchInfo.Rounds, &replyGetRoundsScoring)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+	reply.RoundsScoring = replyGetRoundsScoring
+
+	e.OK(reply, "查询成功")
+}
+
+// Get <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
+// @Summary <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
+// @Description <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
+// @Tags <赛事>比赛
+// @Param id path string false "id"
+// @Success 200 {string} string  {data=models.OrgMatchGetInfoReq} "{"code": 200, "data": [...]}"
+// @Router /api/v1/org-club-team/info [get]
+// @Security Bearer
+func (e OrgClubTeam) GetInfo(c *gin.Context) {
+	req := dto.OrgClubTeamGetInfoReq{}
+	s := service.OrgClubTeam{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("获取球队失败，\r\n失败信息 %s", err.Error()))
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
 		return
 	}
 
-	e.OK( object, "查询成功")
+	p := actions.GetPermissionFromContext(c)
+
+	//联赛级别列表
+	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)
+
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	//赛季列表
+	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{
+		OrgLeagueList:   listOrgLeague,
+		OrgSeasonList:   listOrgSeason,
+		OrgDivisionList: listOrgDivision,
+		OrgTeamList:     listOrgTeam,
+	}
+
+	e.OK(reply, "查询成功")
 }

app/operate/apis/org_team.go

@@ -2,11 +2,11 @@ package apis
 
 import (
 	"fmt"
-
 	"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"
+	"strconv"
 
 	"go-admin/app/operate/models"
 	"go-admin/app/operate/service"
@@ -83,8 +83,24 @@ func (e OrgTeam) Get(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("获取球队失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
+	if object.ClubId == "" {
+		sOrgClubUser := service.OrgClubUser{}
+		_, object.ClubId = sOrgClubUser.GetClubId(user.GetUserId(c))
+	}
+
+	reqClub := dto.OrgClubGetReq{}
+	sClub := service.OrgClub{}
+	var objectClub models.OrgClub
+
+	reqClub.Id, _ = strconv.Atoi(object.ClubId)
+	err = sClub.Get(&reqClub, p, &objectClub)
+
+	reply := dto.OrgTeamGetReply{}
+	reply.ClubId = object.ClubId
+	reply.ClubName = objectClub.ClubName
+	reply.TeamName = object.TeamName
 
-	e.OK( object, "查询成功")
+	e.OK(object, "查询成功")
 }
 
 // Insert <球队>创建球队
@@ -153,7 +169,7 @@ func (e OrgTeam) Update(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("修改球队 失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
-	e.OK( req.GetId(), "修改成功")
+	e.OK(req.GetId(), "修改成功")
 }
 
 // Delete <球队>删除球队
@@ -186,5 +202,5 @@ func (e OrgTeam) Delete(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("删除球队失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
-	e.OK( req.GetId(), "删除成功")
+	e.OK(req.GetId(), "删除成功")
 }

app/operate/apis/org_team_player.go

@@ -2,12 +2,13 @@ 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/response"
 
-	"go-admin/app/operate/models"
 	"go-admin/app/operate/service"
 	"go-admin/app/operate/service/dto"
 	"go-admin/common/actions"
@@ -27,8 +28,8 @@ type OrgTeamPlayer struct {
 // @Router /api/v1/org-team-player [get]
 // @Security Bearer
 func (e OrgTeamPlayer) GetPage(c *gin.Context) {
-    req := dto.OrgPlayerGetPageReq{}
-    s := service.OrgPlayer{}
+	req := dto.OrgTeamPlayerGetPageReq{}
+	s := service.OrgTeamPlayer{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -41,12 +42,12 @@ func (e OrgTeamPlayer) GetPage(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgPlayer, 0)
+	list := make([]dto.OrgTeamPlayerGetPageReply, 0)
 	var count int64
 
 	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
 	}
 
@@ -63,8 +64,8 @@ func (e OrgTeamPlayer) GetPage(c *gin.Context) {
 // @Router /api/v1/org-team-player/get-match [get]
 // @Security Bearer
 func (e OrgTeamPlayer) GetPageMatch(c *gin.Context) {
-	req := dto.OrgPlayerGetPageReq{}
-	s := service.OrgPlayer{}
+	req := dto.GetPageMatchTeamPlayerReq{}
+	s := service.OrgTeamPlayer{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -77,16 +78,33 @@ func (e OrgTeamPlayer) GetPageMatch(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgPlayer, 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()))
+		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 <球队>获取球员表现比赛详情
@@ -98,8 +116,8 @@ func (e OrgTeamPlayer) GetPageMatch(c *gin.Context) {
 // @Router /api/v1/org-team-player/{id} [get]
 // @Security Bearer
 func (e OrgTeamPlayer) Get(c *gin.Context) {
-	req := dto.OrgPlayerGetReq{}
-	s := service.OrgPlayer{}
+	req := dto.OrgTeamPlayerGetReq{}
+	s := service.OrgTeamPlayer{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -110,14 +128,26 @@ func (e OrgTeamPlayer) Get(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
-	var object models.OrgPlayer
 
 	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, "查询成功")
 }

app/operate/apis/org_team_team.go

@@ -27,8 +27,8 @@ type OrgTeamTeam struct {
 // @Router /api/v1/org-team-team [get]
 // @Security Bearer
 func (e OrgTeamTeam) GetPage(c *gin.Context) {
-    req := dto.OrgTeamGetPageReq{}
-    s := service.OrgTeam{}
+	req := dto.OrgTeamTeamGetPageReq{}
+	s := service.OrgTeamTeam{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -41,7 +41,7 @@ func (e OrgTeamTeam) GetPage(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgTeam, 0)
+	list := make([]dto.OrgTeamTeamGetPageReply, 0)
 	var count int64
 
 	err = s.GetPage(&req, p, &list, &count)
@@ -119,5 +119,5 @@ func (e OrgTeamTeam) Get(c *gin.Context) {
 		return
 	}
 
-	e.OK( object, "查询成功")
+	e.OK(object, "查询成功")
 }

app/operate/apis/org_team_user.go

@@ -42,7 +42,7 @@ func (e OrgTeamUser) GetPage(c *gin.Context) {
 	}
 
 	p := actions.GetPermissionFromContext(c)
-	list := make([]models.OrgTeamUser, 0)
+	list := make([]dto.OrgTeamUserGetPageReply, 0)
 	var count int64
 
 	err = s.GetPage(&req, p, &list, &count)
@@ -84,7 +84,7 @@ func (e OrgTeamUser) Get(c *gin.Context) {
 		return
 	}
 
-	e.OK( object, "查询成功")
+	e.OK(object, "查询成功")
 }
 
 // Insert <球队>创建工作人员
@@ -153,7 +153,7 @@ func (e OrgTeamUser) Update(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("修改球队人员账户信息 失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
-	e.OK( req.GetId(), "修改成功")
+	e.OK(req.GetId(), "修改成功")
 }
 
 // Delete <球队>删除工作人员
@@ -186,5 +186,5 @@ func (e OrgTeamUser) Delete(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("删除球队人员账户信息失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
-	e.OK( req.GetId(), "删除成功")
+	e.OK(req.GetId(), "删除成功")
 }

app/operate/models/org_club.go

@@ -8,9 +8,10 @@ import (
 
 type OrgClub struct {
 	models.Model
-    
 	ClubName       string `json:"clubName" gorm:"type:varchar(255);comment:俱乐部名称"`
-    ClubContacts string `json:"clubContacts" gorm:"type:varchar(60);comment:俱乐部联系人"` 
+	ClubUserName   string `json:"clubUserName" gorm:"type:varchar(120);comment:俱乐部账号"`
+	ClubContacts   string `json:"clubContacts" gorm:"type:varchar(120);comment:俱乐部联系人"`
+	ClubContactsEn string `json:"clubContactsEn" gorm:"type:varchar(120);comment:俱乐部联系人"`
 	ClubMobile     string `json:"clubMobile" gorm:"type:varchar(30);comment:俱乐部联系电话"`
 	ClubLogo       string `json:"clubLogo" gorm:"type:varchar(255);comment:俱乐部logo"`
 	ClubQrcode     string `json:"clubQrcode" gorm:"type:varchar(255);comment:俱乐部二维码"`

app/operate/models/org_player.go

@@ -8,7 +8,6 @@ import (
 
 type OrgPlayer struct {
 	models.Model
-
 	ClubId       string `json:"clubId" gorm:"type:bigint(20);comment:org_club表id"`
 	TeamId       string `json:"teamId" gorm:"type:bigint(20);comment:org_team表id"`
 	PlayerName   string `json:"playerName" gorm:"type:varchar(60);comment:球员姓名"`

app/operate/router/org_club_player.go

@@ -18,7 +18,7 @@ func registerOrgClubPlayerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWT
 	r := v1.Group("/org-club-player").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
 		r.GET("", api.GetPage)
-		r.GET("get-match", api.GetPageMatch)
-		r.GET("/:id", api.Get)
+		r.GET("/get-match", api.GetPageMatch)
+		r.GET("/get", api.Get)
 	}
 }

app/operate/router/org_club_team.go

@@ -18,7 +18,8 @@ func registerOrgClubTeamRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
 	r := v1.Group("/org-club-team").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
 		r.GET("", api.GetPage)
-		r.GET("get-match", api.GetPageMatch)
-		r.GET("/:id", api.Get)
+		r.GET("/get-match", api.GetPageMatch)
+		r.GET("/get", api.Get)
+		r.GET("/info", api.GetInfo)
 	}
 }

app/operate/router/org_team_player.go

@@ -18,7 +18,7 @@ func registerOrgTeamPlayerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWT
 	r := v1.Group("/org-team-player").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
 		r.GET("", api.GetPage)
-		r.GET("get-match", api.GetPageMatch)
-		r.GET("/:id", api.Get)
+		r.GET("/get-match", api.GetPageMatch)
+		r.GET("/get", api.Get)
 	}
 }

app/operate/router/org_team_team.go

@@ -18,7 +18,7 @@ func registerOrgTeamTeamRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
 	r := v1.Group("/org-team-team").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
 		r.GET("", api.GetPage)
-		r.GET("get-match", api.GetPageMatch)
-		r.GET("/:id", api.Get)
+		r.GET("/get-match", api.GetPageMatch)
+		r.GET("/get", api.Get)
 	}
 }

app/operate/service/dto/org_club.go

@@ -4,26 +4,11 @@ import (
 	"go-admin/app/operate/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"time"
 )
 
 type OrgClubGetPageReq struct {
 	dto.Pagination `search:"-"`
-    OrgClubOrder
-}
-
-type OrgClubOrder struct {Id int `form:"idOrder"  search:"type:order;column:id;table:org_club"`
-    ClubName string `form:"clubNameOrder"  search:"type:order;column:club_name;table:org_club"`
-    ClubContacts string `form:"clubContactsOrder"  search:"type:order;column:club_contacts;table:org_club"`
-    ClubMobile string `form:"clubMobileOrder"  search:"type:order;column:club_mobile;table:org_club"`
-    ClubLogo string `form:"clubLogoOrder"  search:"type:order;column:club_logo;table:org_club"`
-    ClubQrcode string `form:"clubQrcodeOrder"  search:"type:order;column:club_qrcode;table:org_club"`
-    CreateBy string `form:"createByOrder"  search:"type:order;column:create_by;table:org_club"`
-    UpdateBy string `form:"updateByOrder"  search:"type:order;column:update_by;table:org_club"`
-    CreatedAt time.Time `form:"createdAtOrder"  search:"type:order;column:created_at;table:org_club"`
-    UpdatedAt time.Time `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:org_club"`
-    DeletedAt time.Time `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:org_club"`
-    
+	ClubName       string `form:"clubNameOrder" json:"clubName" comment:"俱乐部名称"`
 }
 
 func (m *OrgClubGetPageReq) GetNeedSearch() interface{} {
@@ -33,7 +18,9 @@ func (m *OrgClubGetPageReq) GetNeedSearch() interface{} {
 type OrgClubInsertReq struct {
 	Id             int    `json:"-" comment:""` //
 	ClubName       string `json:"clubName" comment:"俱乐部名称"`
+	ClubUserName   string `json:"clubUserName" comment:"俱乐部账号"`
 	ClubContacts   string `json:"clubContacts" comment:"俱乐部联系人"`
+	ClubContactsEn string `json:"clubContactsEn" comment:"俱乐部联系人"`
 	ClubMobile     string `json:"clubMobile" comment:"俱乐部联系电话"`
 	ClubLogo       string `json:"clubLogo" comment:"俱乐部logo"`
 	ClubQrcode     string `json:"clubQrcode" comment:"俱乐部二维码"`
@@ -42,10 +29,12 @@ type OrgClubInsertReq struct {
 
 func (s *OrgClubInsertReq) Generate(model *models.OrgClub) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.ClubName = s.ClubName
+	model.ClubUserName = s.ClubUserName
 	model.ClubContacts = s.ClubContacts
+	model.ClubContactsEn = s.ClubContactsEn
 	model.ClubMobile = s.ClubMobile
 	model.ClubLogo = s.ClubLogo
 	model.ClubQrcode = s.ClubQrcode
@@ -58,7 +47,9 @@ func (s *OrgClubInsertReq) GetId() interface{} {
 type OrgClubUpdateReq struct {
 	Id             int    `uri:"id" comment:""` //
 	ClubName       string `json:"clubName" comment:"俱乐部名称"`
+	ClubUserName   string `json:"clubUserName" comment:"俱乐部账号"`
 	ClubContacts   string `json:"clubContacts" comment:"俱乐部联系人"`
+	ClubContactsEn string `json:"clubContactsEn" comment:"俱乐部联系人"`
 	ClubMobile     string `json:"clubMobile" comment:"俱乐部联系电话"`
 	ClubLogo       string `json:"clubLogo" comment:"俱乐部logo"`
 	ClubQrcode     string `json:"clubQrcode" comment:"俱乐部二维码"`
@@ -67,10 +58,12 @@ type OrgClubUpdateReq struct {
 
 func (s *OrgClubUpdateReq) Generate(model *models.OrgClub) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.ClubName = s.ClubName
+	model.ClubUserName = s.ClubUserName
 	model.ClubContacts = s.ClubContacts
+	model.ClubContactsEn = s.ClubContactsEn
 	model.ClubMobile = s.ClubMobile
 	model.ClubLogo = s.ClubLogo
 	model.ClubQrcode = s.ClubQrcode
@@ -84,13 +77,14 @@ func (s *OrgClubUpdateReq) GetId() interface{} {
 type OrgClubGetReq struct {
 	Id int `uri:"id"`
 }
+
 func (s *OrgClubGetReq) GetId() interface{} {
 	return s.Id
 }
 
 // OrgClubDeleteReq 功能删除请求参数
 type OrgClubDeleteReq struct {
-	Ids []int `json:"ids"`
+	Ids int `json:"ids"`
 }
 
 func (s *OrgClubDeleteReq) GetId() interface{} {

app/operate/service/dto/org_club_player.go

+package dto
+
+import (
+	"go-admin/common/dto"
+)
+
+type OrgClubPlayerGetPageReq struct {
+	dto.Pagination `search:"-"`
+	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:"球员名称"` //球员名称
+}
+
+type OrgClubPlayerGetPageReply struct {
+	Id           string `json:"id"`
+	Rank         string `json:"rank"`
+	LeagueName   string `json:"leagueName"`
+	SeasonName   string `json:"seasonName"`
+	Rounds       string `json:"rounds"`
+	PlayerName   string `json:"playerName"`
+	PlayerNumber string `json:"playerNumber" comment:"球衣号码"`
+	Position     string `json:"position" comment:"场上位置"`
+	dto.TotalScoring
+}
+
+type GetPageMatchClubPlayerReq struct {
+	Id string `form:"id" json:"id"`
+}
+type GetPageMatchClubPlayerReply struct {
+	MatchInfo     dto.PageMatchInfo   `json:"matchInfo"`
+	TotalScoring  []dto.TotalScoring  `json:"totalScoring"`
+	RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
+}
+
+func (m *OrgClubPlayerGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+// OrgMatchEvaluateGetReq 功能获取请求参数
+type OrgClubPlayerGetReq struct {
+	Id int `uri:"id"`
+}
+
+type OrgClubPlayerGetReply struct {
+	MatchInfo     dto.PageMatchInfo   `json:"matchInfo"`
+	RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
+}
+
+func (s *OrgClubPlayerGetReq) GetId() interface{} {
+	return s.Id
+}

app/operate/service/dto/org_club_team.go

+package dto
+
+import (
+	"go-admin/app/operate/models"
+	"go-admin/common/dto"
+)
+
+type OrgClubTeamGetPageReq 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:""`
+}
+
+type OrgClubTeamGetPageReply struct {
+	TeamId       string `json:"teamId"`
+	Rank         string `json:"rank"`
+	LeagueName   string `json:"leagueName"`
+	DivisionName string `json:"divisionName"`
+	SeasonName   string `json:"seasonName"`
+	Rounds       string `json:"rounds"`
+	dto.TotalScoring
+}
+
+type OrgClubTeamGetInfoReq struct {
+}
+
+type OrgClubTeamGetInfoReply 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 *OrgClubTeamGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+// OrgMatchGetReq 功能获取请求参数
+type OrgClubTeamGetReq struct {
+	TeamId int `form:"teamId" json:"teamId"`
+	Rounds int `form:"rounds" json:"rounds"`
+}
+type OrgClubTeamGetReply struct {
+	OrgMatch            models.OrgMatch             `form:"orgMatch" json:"orgMatch"`
+	OrgMatchTeamAPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamAPlayer" json:"orgMatchTeamAPlayer"`
+	OrgMatchTeamBPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamBPlayer" json:"orgMatchTeamBPlayer"`
+}
+
+func (s *OrgClubTeamGetReq) GetId() interface{} {
+	return s.TeamId
+}
+
+type GetPageMatchClubTeamReq struct {
+	TeamId int `form:"teamId" json:"teamId"`
+}
+type GetPageMatchClubTeamReply struct {
+	MatchInfo     dto.PageMatchInfo   `json:"matchInfo"`
+	TotalScoring  []dto.TotalScoring  `json:"totalScoring"`
+	RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
+}

app/operate/service/dto/org_club_user.go

@@ -12,7 +12,8 @@ type OrgClubUserGetPageReq struct {
 	OrgClubUserOrder
 }
 
-type OrgClubUserOrder struct {Id int `form:"idOrder"  search:"type:order;column:id;table:org_club_user"`
+type OrgClubUserOrder struct {
+	Id        int       `form:"idOrder"  search:"type:order;column:id;table:org_club_user"`
 	UserId    string    `form:"userIdOrder"  search:"type:order;column:user_id;table:org_club_user"`
 	ClubId    string    `form:"clubIdOrder"  search:"type:order;column:club_id;table:org_club_user"`
 	CreateBy  string    `form:"createByOrder"  search:"type:order;column:create_by;table:org_club_user"`
@@ -20,7 +21,6 @@ type OrgClubUserOrder struct {Id int `form:"idOrder"  search:"type:order;column:
 	CreatedAt time.Time `form:"createdAtOrder"  search:"type:order;column:created_at;table:org_club_user"`
 	UpdatedAt time.Time `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:org_club_user"`
 	DeletedAt time.Time `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:org_club_user"`
-    
 }
 
 func (m *OrgClubUserGetPageReq) GetNeedSearch() interface{} {
@@ -36,7 +36,7 @@ type OrgClubUserInsertReq struct {
 
 func (s *OrgClubUserInsertReq) Generate(model *models.OrgClubUser) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.UserId = s.UserId
 	model.ClubId = s.ClubId
@@ -55,7 +55,7 @@ type OrgClubUserUpdateReq struct {
 
 func (s *OrgClubUserUpdateReq) Generate(model *models.OrgClubUser) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.UserId = s.UserId
 	model.ClubId = s.ClubId
@@ -69,6 +69,7 @@ func (s *OrgClubUserUpdateReq) GetId() interface{} {
 type OrgClubUserGetReq struct {
 	Id int `uri:"id"`
 }
+
 func (s *OrgClubUserGetReq) GetId() interface{} {
 	return s.Id
 }

app/operate/service/dto/org_team.go

@@ -12,7 +12,8 @@ type OrgTeamGetPageReq struct {
 	OrgTeamOrder
 }
 
-type OrgTeamOrder struct {Id int `form:"idOrder"  search:"type:order;column:id;table:org_team"`
+type OrgTeamOrder struct {
+	Id        int       `form:"idOrder"  search:"type:order;column:id;table:org_team"`
 	ClubId    string    `form:"clubIdOrder"  search:"type:order;column:club_id;table:org_team"`
 	TeamName  string    `form:"teamNameOrder"  search:"type:order;column:team_name;table:org_team"`
 	CreateBy  string    `form:"createByOrder"  search:"type:order;column:create_by;table:org_team"`
@@ -20,7 +21,6 @@ type OrgTeamOrder struct {Id int `form:"idOrder"  search:"type:order;column:id;t
 	CreatedAt time.Time `form:"createdAtOrder"  search:"type:order;column:created_at;table:org_team"`
 	UpdatedAt time.Time `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:org_team"`
 	DeletedAt time.Time `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:org_team"`
-    
 }
 
 func (m *OrgTeamGetPageReq) GetNeedSearch() interface{} {
@@ -36,7 +36,7 @@ type OrgTeamInsertReq struct {
 
 func (s *OrgTeamInsertReq) Generate(model *models.OrgTeam) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.ClubId = s.ClubId
 	model.TeamName = s.TeamName
@@ -55,7 +55,7 @@ type OrgTeamUpdateReq struct {
 
 func (s *OrgTeamUpdateReq) Generate(model *models.OrgTeam) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.ClubId = s.ClubId
 	model.TeamName = s.TeamName
@@ -69,6 +69,13 @@ func (s *OrgTeamUpdateReq) GetId() interface{} {
 type OrgTeamGetReq struct {
 	Id int `uri:"id"`
 }
+
+type OrgTeamGetReply struct {
+	ClubId   string `json:"club_id"`
+	ClubName string `json:"club_name"`
+	TeamName string `json:"team_name"`
+}
+
 func (s *OrgTeamGetReq) GetId() interface{} {
 	return s.Id
 }

app/operate/service/dto/org_team_player.go

+package dto
+
+import (
+	"go-admin/common/dto"
+)
+
+type OrgTeamPlayerGetPageReq struct {
+	dto.Pagination `search:"-"`
+	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:"球员名称"` //球员名称
+}
+
+type OrgTeamPlayerGetPageReply struct {
+	Id           string `json:"id"`
+	Rank         string `json:"rank"`
+	LeagueName   string `json:"leagueName"`
+	SeasonName   string `json:"seasonName"`
+	Rounds       string `json:"rounds"`
+	PlayerName   string `json:"playerName"`
+	PlayerNumber string `json:"playerNumber" comment:"球衣号码"`
+	Position     string `json:"position" comment:"场上位置"`
+	dto.TotalScoring
+}
+
+type GetPageMatchTeamPlayerReq struct {
+	Id string `form:"id" json:"id"`
+}
+type GetPageMatchTeamPlayerReply struct {
+	MatchInfo     dto.PageMatchInfo   `json:"matchInfo"`
+	TotalScoring  []dto.TotalScoring  `json:"totalScoring"`
+	RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
+}
+
+func (m *OrgTeamPlayerGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+// OrgMatchEvaluateGetReq 功能获取请求参数
+type OrgTeamPlayerGetReq struct {
+	Id int `uri:"id"`
+}
+
+type OrgTeamPlayerGetReply struct {
+	MatchInfo     dto.PageMatchInfo   `json:"matchInfo"`
+	RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
+}
+
+func (s *OrgTeamPlayerGetReq) GetId() interface{} {
+	return s.Id
+}

app/operate/service/dto/org_team_team.go

+package dto
+
+import (
+	"go-admin/app/operate/models"
+	"go-admin/common/dto"
+)
+
+type OrgTeamTeamGetPageReq 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:""`
+}
+
+type OrgTeamTeamGetPageReply struct {
+	TeamId       string `json:"teamId"`
+	Rank         string `json:"rank"`
+	LeagueName   string `json:"leagueName"`
+	DivisionName string `json:"divisionName"`
+	SeasonName   string `json:"seasonName"`
+	Rounds       string `json:"rounds"`
+	dto.TotalScoring
+}
+
+type OrgTeamTeamGetInfoReq struct {
+}
+
+type OrgTeamTeamGetInfoReply 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 *OrgTeamTeamGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+// OrgMatchGetReq 功能获取请求参数
+type OrgTeamTeamGetReq struct {
+	TeamId int `form:"teamId" json:"teamId"`
+	Rounds int `form:"rounds" json:"rounds"`
+}
+type OrgTeamTeamGetReply struct {
+	OrgMatch            models.OrgMatch             `form:"orgMatch" json:"orgMatch"`
+	OrgMatchTeamAPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamAPlayer" json:"orgMatchTeamAPlayer"`
+	OrgMatchTeamBPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamBPlayer" json:"orgMatchTeamBPlayer"`
+}
+
+func (s *OrgTeamTeamGetReq) GetId() interface{} {
+	return s.TeamId
+}
+
+type GetPageMatchTeamTeamReq struct {
+	TeamId int `form:"teamId" json:"teamId"`
+}
+type GetPageMatchTeamTeamReply struct {
+	MatchInfo     dto.PageMatchInfo   `json:"matchInfo"`
+	TotalScoring  []dto.TotalScoring  `json:"totalScoring"`
+	RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
+}

app/operate/service/dto/org_team_user.go

@@ -4,28 +4,23 @@ import (
 	"go-admin/app/operate/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"time"
 )
 
 type OrgTeamUserGetPageReq struct {
 	dto.Pagination `search:"-"`
-    OrgTeamUserOrder
+	TeamName       string `form:"teamName"  search:"type:contains;column:team_name;table:ot" comment:"球队名称"` //球队名称
+	Name           string `form:"name"  search:"type:contains;column:name;table:otu" comment:"姓名"`           //姓名
+	Status         string `form:"status"  search:"type:exact;column:status;table:su" comment:"状态"`           //状态
 }
 
-type OrgTeamUserOrder struct {Id int `form:"idOrder"  search:"type:order;column:id;table:org_team_user"`
-    ClubId string `form:"clubIdOrder"  search:"type:order;column:club_id;table:org_team_user"`
-    TeamId string `form:"teamIdOrder"  search:"type:order;column:team_id;table:org_team_user"`
-    UserId string `form:"userIdOrder"  search:"type:order;column:user_id;table:org_team_user"`
-    Name string `form:"nameOrder"  search:"type:order;column:name;table:org_team_user"`
-    Sex string `form:"sexOrder"  search:"type:order;column:sex;table:org_team_user"`
-    UserImg string `form:"userImgOrder"  search:"type:order;column:user_img;table:org_team_user"`
-    SignImg string `form:"signImgOrder"  search:"type:order;column:sign_img;table:org_team_user"`
-    CreateBy string `form:"createByOrder"  search:"type:order;column:create_by;table:org_team_user"`
-    UpdateBy string `form:"updateByOrder"  search:"type:order;column:update_by;table:org_team_user"`
-    CreatedAt time.Time `form:"createdAtOrder"  search:"type:order;column:created_at;table:org_team_user"`
-    UpdatedAt time.Time `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:org_team_user"`
-    DeletedAt time.Time `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:org_team_user"`
-    
+type OrgTeamUserGetPageReply struct {
+	Id       string `json:"id"`
+	ClubName string `json:"clubName"`
+	TeamName string `json:"teamName"`
+	Name     string `json:"name"`
+	Sex      string `json:"sex"`
+	RoleName string `json:"roleName"`
+	Status   string `json:"status"`
 }
 
 func (m *OrgTeamUserGetPageReq) GetNeedSearch() interface{} {
@@ -46,7 +41,7 @@ type OrgTeamUserInsertReq struct {
 
 func (s *OrgTeamUserInsertReq) Generate(model *models.OrgTeamUser) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.ClubId = s.ClubId
 	model.TeamId = s.TeamId
@@ -75,7 +70,7 @@ type OrgTeamUserUpdateReq struct {
 
 func (s *OrgTeamUserUpdateReq) Generate(model *models.OrgTeamUser) {
 	if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
+		model.Model = common.Model{Id: s.Id}
 	}
 	model.ClubId = s.ClubId
 	model.TeamId = s.TeamId
@@ -94,6 +89,22 @@ func (s *OrgTeamUserUpdateReq) GetId() interface{} {
 type OrgTeamUserGetReq struct {
 	Id int `uri:"id"`
 }
+
+type OrgTeamUserGetReply struct {
+	Id       string `json:"id"`
+	ClubName string `json:"clubName"`
+	TeamId   string `json:"teamId"`
+	TeamName string `json:"teamName"`
+	Name     string `json:"name"`
+	Sex      string `json:"sex"`
+	UserImg  string `json:"userImg" comment:"用户照片"`
+	SignImg  string `json:"signImg" comment:"签名照片"`
+	RoleId   string `json:"roleId"`
+	RoleName string `json:"roleName"`
+	Username string `json:"username"`
+	Status   string `json:"status"`
+}
+
 func (s *OrgTeamUserGetReq) GetId() interface{} {
 	return s.Id
 }

app/operate/service/org_club_user.go

@@ -57,6 +57,34 @@ func (e *OrgClubUser) Get(d *dto.OrgClubUserGetReq, p *actions.DataPermission, m
 	return nil
 }
 
+// Get 获取OrgClubUser对象
+func (e *OrgClubUser) GetUserId(clubId int) (error, string) {
+	var data models.OrgClubUser
+
+	err := e.Orm.Table("org_club_user").
+		Where("club_id=?", clubId).
+		First(data).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err, ""
+	}
+	return nil, data.UserId
+}
+
+// Get 获取OrgClubUser对象
+func (e *OrgClubUser) GetClubId(userId int) (error, string) {
+	var data models.OrgClubUser
+
+	err := e.Orm.Table("org_club_user").
+		Where("user_id=?", userId).
+		First(data).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err, ""
+	}
+	return nil, data.ClubId
+}
+
 // Insert 创建OrgClubUser对象
 func (e *OrgClubUser) Insert(c *dto.OrgClubUserInsertReq) error {
 	var err error

app/operate/service/org_match_evaluate.go

@@ -24,7 +24,7 @@ func (e *OrgMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *actions
 	err = e.Orm.Table("org_match_team_player as omtp").
 		Select("omtp.id, 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").
 		Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
-		Joins("left join org_match as om on omtp.match_id = om.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").
 		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").
@@ -55,7 +55,7 @@ func (e *OrgMatchEvaluate) GetMatchInfo(id string, p *actions.DataPermission, da
 		Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
 		Joins("left join org_club as oc on omtp.club_id = oc.id").
 		Joins("left join org_team as ot on omtp.team_id = ot.id").
-		Joins("left join org_match as om on omtp.match_id = om.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").
 		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").
@@ -79,7 +79,7 @@ func (e *OrgMatchEvaluate) GetRoundsScoring(playerId string, rounds string, team
 		Select("omtp.id, om.match_start_time, om.rounds, om.grouping, ot.team_name as other_team, "+
 			"omtp.scoring, omtp.scoring, omtp.rebound, omtp.assist, omtp.steal, omtp.free_throw, "+
 			"omtp.block_shot, omtp.foul, omtp.two_point_shot, omtp.three_point_shot").
-		Joins("left join org_match as om on omtp.match_id = om.id").
+		Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
 		Joins("left join org_team as ot on omtp.other_team_id = ot.id").
 		Scopes(
 			cDto.SetWhere("omtp", "player_id", playerId),
@@ -123,7 +123,7 @@ func (e *OrgMatchEvaluate) statisticsScoring(playerId string, rounds string, sea
 	}
 
 	err = e.Orm.Table("org_match_team_player as omtp").
-		Joins("left join org_match as om on omtp.match_id = om.id").
+		Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
 		Select(field).
 		Where("omtp.player_id = ?", playerId).
 		Where("omtp.rounds = ?", rounds).

app/operate/service/org_team_user.go

@@ -17,11 +17,17 @@ type OrgTeamUser struct {
 }
 
 // GetPage 获取OrgTeamUser列表
-func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermission, list *[]models.OrgTeamUser, count *int64) error {
+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"
 
-	err = e.Orm.Model(&data).
+	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").
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
@@ -38,12 +44,14 @@ func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermi
 
 // Get 获取OrgTeamUser对象
 func (e *OrgTeamUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model *models.OrgTeamUser) error {
-	var data models.OrgTeamUser
+	field := "oc.club_name, ot.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status"
 
-	err := e.Orm.Model(&data).
-		Scopes(
-			actions.Permission(data.TableName(), p),
-		).
+	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.id").
+		Joins("sys_role as sr on su.role_id=sr.role_id").
 		First(model, d.GetId()).Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		err = errors.New("查看对象不存在或无权查看")

common/dto/match.go

@@ -10,6 +10,7 @@ type PageMatchInfo struct {
 	SeasonName              string `json:"seasonName"`
 	Rounds                  string `json:"rounds"`
 	ClubName                string `json:"clubName"`
+	TeamId                  string `json:"teamId"`
 	TeamName                string `json:"teamName"`
 	PlayerId                string `json:"playerId"`
 	PlayerName              string `json:"playerName"`

common/utils/common.go

+package utils
+
+import "strconv"
+
+func StringToInt(data string) int {
+	reply, _ := strconv.Atoi(data)
+	return reply
+}
+
+func GetAvg(data string, count int64) string {
+	return strconv.Itoa(StringToInt(data) / int(count))
+}