Skip to content

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

team

parent 6f7e1417
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 87 deletions
app/operate/apis/org_club.go
View file @ b17ad4e2
...@@ -27,6 +27,7 @@ type OrgClub struct { ...@@ -27,6 +27,7 @@ type OrgClub struct {
// @Tags <俱乐部>俱乐部 // @Tags <俱乐部>俱乐部
// @Param pageSize query int false "页条数" // @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码" // @Param pageIndex query int false "页码"
// @Param data body dto.OrgClubGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}" // @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-club [get] // @Router /api/v1/org-club [get]
// @Security Bearer // @Security Bearer
......
app/operate/apis/org_club_team.go
View file @ b17ad4e2
...@@ -233,7 +233,7 @@ func (e OrgClubTeam) GetInfo(c *gin.Context) { ...@@ -233,7 +233,7 @@ func (e OrgClubTeam) GetInfo(c *gin.Context) {
//球队列表 //球队列表
sOrgTeam := service.OrgTeam{} sOrgTeam := service.OrgTeam{}
listOrgTeam := make([]models.OrgTeam, 0) listOrgTeam := make([]dto.OrgTeamGetPageReply, 0)
var countOrgTeam int64 = 0 var countOrgTeam int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors
......
app/operate/apis/org_match.go
View file @ b17ad4e2
...@@ -142,7 +142,7 @@ func (e OrgMatch) GetInfo(c *gin.Context) { ...@@ -142,7 +142,7 @@ func (e OrgMatch) GetInfo(c *gin.Context) {
//球队列表 //球队列表
sOrgTeam := service.OrgTeam{} sOrgTeam := service.OrgTeam{}
listOrgTeam := make([]models.OrgTeam, 0) listOrgTeam := make([]dto.OrgTeamGetPageReply, 0)
var countOrgTeam int64 = 0 var countOrgTeam int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors
......
app/operate/apis/org_team.go
View file @ b17ad4e2
...@@ -24,6 +24,7 @@ type OrgTeam struct { ...@@ -24,6 +24,7 @@ type OrgTeam struct {
// @Tags <球队>球队 // @Tags <球队>球队
// @Param pageSize query int false "页条数" // @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码" // @Param pageIndex query int false "页码"
// @Param data body dto.OrgTeamGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}" // @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-team [get] // @Router /api/v1/org-team [get]
// @Security Bearer // @Security Bearer
...@@ -42,7 +43,7 @@ func (e OrgTeam) GetPage(c *gin.Context) { ...@@ -42,7 +43,7 @@ func (e OrgTeam) GetPage(c *gin.Context) {
} }
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
list := make([]models.OrgTeam, 0) list := make([]dto.OrgTeamGetPageReply, 0)
var count int64 var count int64
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
......
app/operate/apis/org_team_match.go
View file @ b17ad4e2
...@@ -323,7 +323,7 @@ func (e OrgTeamMatch) GetInfo(c *gin.Context) { ...@@ -323,7 +323,7 @@ func (e OrgTeamMatch) GetInfo(c *gin.Context) {
//球队列表 //球队列表
sOrgTeam := service.OrgTeam{} sOrgTeam := service.OrgTeam{}
listOrgTeam := make([]models.OrgTeam, 0) listOrgTeam := make([]dto.OrgTeamGetPageReply, 0)
var countOrgTeam int64 = 0 var countOrgTeam int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors
......
app/operate/apis/org_team_team.go
View file @ b17ad4e2
...@@ -77,7 +77,7 @@ func (e OrgTeamTeam) GetPageMatch(c *gin.Context) { ...@@ -77,7 +77,7 @@ func (e OrgTeamTeam) GetPageMatch(c *gin.Context) {
} }
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
list := make([]models.OrgTeam, 0) list := make([]dto.OrgTeamGetPageReply, 0)
var count int64 var count int64
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
......
app/operate/service/dto/org_club.go
View file @ b17ad4e2
...@@ -8,9 +8,9 @@ import ( ...@@ -8,9 +8,9 @@ import (
type OrgClubGetPageReq struct { type OrgClubGetPageReq struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
ClubName string `form:"clubName" json:"clubName" search:"type:contains;column:club_name;table:org_club" comment:"俱乐部名称"` ClubName string `form:"clubName" json:"clubName" search:"type:contains;column:club_name;table:org_club" comment:"俱乐部名称"` //俱乐部名称
CreateStartTime string `form:"createStartTime" search:"type:gte;column:create_at;table:org_club" comment:"开始时间"` CreateStartTime string `form:"createStartTime" search:"type:gte;column:create_at;table:org_club" comment:"开始时间"` //开始时间
CreateEndTime string `form:"createEndTime" search:"type:lte;column:create_at;table:org_club" comment:"结束时间"` CreateEndTime string `form:"createEndTime" search:"type:lte;column:create_at;table:org_club" comment:"结束时间"` //结束时间
} }
func (m *OrgClubGetPageReq) GetNeedSearch() interface{} { func (m *OrgClubGetPageReq) GetNeedSearch() interface{} {
......
app/operate/service/dto/org_match.go
View file @ b17ad4e2
...@@ -39,11 +39,11 @@ type OrgMatchGetInfoReq struct { ...@@ -39,11 +39,11 @@ type OrgMatchGetInfoReq struct {
} }
type OrgMatchGetInfoReply struct { type OrgMatchGetInfoReply struct {
OrgMatch models.OrgMatch `form:"orgMatch"` OrgMatch models.OrgMatch `form:"orgMatch"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"` OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
OrgSeasonList []models.OrgSeason `form:"orgSeasonList"` OrgSeasonList []models.OrgSeason `form:"orgSeasonList"`
OrgDivisionList []models.OrgDivision `form:"orgDivisionList"` OrgDivisionList []models.OrgDivision `form:"orgDivisionList"`
OrgTeamList []models.OrgTeam `form:"orgTeamList"` OrgTeamList []OrgTeamGetPageReply `form:"orgTeamList"`
} }
type OrgMatchOrder struct { type OrgMatchOrder struct {
......
app/operate/service/dto/org_team.go
View file @ b17ad4e2
...@@ -8,8 +8,17 @@ import ( ...@@ -8,8 +8,17 @@ import (
) )
type OrgTeamGetPageReq struct { type OrgTeamGetPageReq struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
OrgTeamOrder TeamName string `form:"teamName" json:"teamName" search:"type:contains;column:team_name;table:ot" comment:"球队名称"` //球队名称
CreateStartTime string `form:"createStartTime" search:"type:gte;column:created_at;table:ot" comment:"开始时间"` //开始时间
CreateEndTime string `form:"createEndTime" search:"type:lte;column:created_at;table:ot" comment:"结束时间"` //结束时间
}
type OrgTeamGetPageReply struct {
Id string `json:"id" comment:"球队id"` //球队id
ClubName string `json:"clubName" comment:"俱乐部名称"`
TeamName string `json:"teamName" comment:"球队名称"`
CreatedAt string `json:"createdAt" comment:"球队创建时间"`
} }
type OrgTeamOrder struct { type OrgTeamOrder struct {
......
app/operate/service/org_team.go
View file @ b17ad4e2
...@@ -17,11 +17,13 @@ type OrgTeam struct { ...@@ -17,11 +17,13 @@ type OrgTeam struct {
} }
// GetPage 获取OrgTeam列表 // GetPage 获取OrgTeam列表
func (e *OrgTeam) GetPage(c *dto.OrgTeamGetPageReq, p *actions.DataPermission, list *[]models.OrgTeam, count *int64) error { func (e *OrgTeam) GetPage(c *dto.OrgTeamGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamGetPageReply, count *int64) error {
var err error var err error
var data models.OrgTeam var data models.OrgTeam
err = e.Orm.Model(&data). err = e.Orm.Table("org_team as ot").
Select("ot.id,oc.club_name,ot.team_name,ot.created_at").
Joins("left join org_club as oc on ot.club_id=oc.id").
Scopes( Scopes(
cDto.MakeCondition(c.GetNeedSearch()), cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
......
docs/docs.go
View file @ b17ad4e2
...@@ -1221,6 +1221,15 @@ var doc = `{ ...@@ -1221,6 +1221,15 @@ var doc = `{
"description": "页码", "description": "页码",
"name": "pageIndex", "name": "pageIndex",
"in": "query" "in": "query"
},
{
"description": "data",
"name": "data",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/dto.OrgClubGetPageReq"
}
} }
], ],
"responses": { "responses": {
...@@ -3402,6 +3411,15 @@ var doc = `{ ...@@ -3402,6 +3411,15 @@ var doc = `{
"description": "页码", "description": "页码",
"name": "pageIndex", "name": "pageIndex",
"in": "query" "in": "query"
},
{
"description": "data",
"name": "data",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/dto.OrgTeamGetPageReq"
}
} }
], ],
"responses": { "responses": {
...@@ -6335,6 +6353,29 @@ var doc = `{ ...@@ -6335,6 +6353,29 @@ var doc = `{
} }
} }
}, },
"dto.OrgClubGetPageReq": {
"type": "object",
"properties": {
"clubName": {
"description": "俱乐部名称",
"type": "string"
},
"createEndTime": {
"description": "结束时间",
"type": "string"
},
"createStartTime": {
"description": "开始时间",
"type": "string"
},
"pageIndex": {
"type": "integer"
},
"pageSize": {
"type": "integer"
}
}
},
"dto.OrgClubInsertReq": { "dto.OrgClubInsertReq": {
"type": "object", "type": "object",
"properties": { "properties": {
...@@ -6356,7 +6397,7 @@ var doc = `{ ...@@ -6356,7 +6397,7 @@ var doc = `{
"clubQrcode": { "clubQrcode": {
"type": "string" "type": "string"
}, },
"clubUserName": { "clubUsername": {
"type": "string" "type": "string"
}, },
"createBy": { "createBy": {
...@@ -6388,7 +6429,7 @@ var doc = `{ ...@@ -6388,7 +6429,7 @@ var doc = `{
"clubQrcode": { "clubQrcode": {
"type": "string" "type": "string"
}, },
"clubUserName": { "clubUsername": {
"type": "string" "type": "string"
}, },
"createBy": { "createBy": {
...@@ -7125,6 +7166,29 @@ var doc = `{ ...@@ -7125,6 +7166,29 @@ var doc = `{
} }
} }
}, },
"dto.OrgTeamGetPageReq": {
"type": "object",
"properties": {
"createEndTime": {
"description": "结束时间",
"type": "string"
},
"createStartTime": {
"description": "开始时间",
"type": "string"
},
"pageIndex": {
"type": "integer"
},
"pageSize": {
"type": "integer"
},
"teamName": {
"description": "球队名称",
"type": "string"
}
}
},
"dto.OrgTeamInsertReq": { "dto.OrgTeamInsertReq": {
"type": "object", "type": "object",
"properties": { "properties": {
...@@ -7218,6 +7282,12 @@ var doc = `{ ...@@ -7218,6 +7282,12 @@ var doc = `{
"name": { "name": {
"type": "string" "type": "string"
}, },
"name_en": {
"type": "string"
},
"roleId": {
"type": "string"
},
"sex": { "sex": {
"type": "string" "type": "string"
}, },
...@@ -7235,6 +7305,9 @@ var doc = `{ ...@@ -7235,6 +7305,9 @@ var doc = `{
}, },
"userImg": { "userImg": {
"type": "string" "type": "string"
},
"userName": {
"type": "string"
} }
} }
}, },
...@@ -8364,21 +8437,9 @@ var doc = `{ ...@@ -8364,21 +8437,9 @@ var doc = `{
"action": { "action": {
"type": "string" "type": "string"
}, },
"apis": {
"type": "array",
"items": {
"type": "integer"
}
},
"breadcrumb": { "breadcrumb": {
"type": "string" "type": "string"
}, },
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysMenu"
}
},
"component": { "component": {
"type": "string" "type": "string"
}, },
...@@ -8388,18 +8449,12 @@ var doc = `{ ...@@ -8388,18 +8449,12 @@ var doc = `{
"createdAt": { "createdAt": {
"type": "string" "type": "string"
}, },
"dataScope": {
"type": "string"
},
"icon": { "icon": {
"type": "string" "type": "string"
}, },
"isFrame": { "isFrame": {
"type": "string" "type": "string"
}, },
"is_select": {
"type": "boolean"
},
"menuId": { "menuId": {
"type": "integer" "type": "integer"
}, },
...@@ -8412,9 +8467,6 @@ var doc = `{ ...@@ -8412,9 +8467,6 @@ var doc = `{
"noCache": { "noCache": {
"type": "boolean" "type": "boolean"
}, },
"params": {
"type": "string"
},
"parentId": { "parentId": {
"type": "integer" "type": "integer"
}, },
...@@ -8427,9 +8479,6 @@ var doc = `{ ...@@ -8427,9 +8479,6 @@ var doc = `{
"permission": { "permission": {
"type": "string" "type": "string"
}, },
"roleId": {
"type": "integer"
},
"sort": { "sort": {
"type": "integer" "type": "integer"
}, },
......
docs/swagger.json
View file @ b17ad4e2
...@@ -1204,6 +1204,15 @@ ...@@ -1204,6 +1204,15 @@
"description": "页码", "description": "页码",
"name": "pageIndex", "name": "pageIndex",
"in": "query" "in": "query"
},
{
"description": "data",
"name": "data",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/dto.OrgClubGetPageReq"
}
} }
], ],
"responses": { "responses": {
...@@ -3385,6 +3394,15 @@ ...@@ -3385,6 +3394,15 @@
"description": "页码", "description": "页码",
"name": "pageIndex", "name": "pageIndex",
"in": "query" "in": "query"
},
{
"description": "data",
"name": "data",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/dto.OrgTeamGetPageReq"
}
} }
], ],
"responses": { "responses": {
...@@ -6318,6 +6336,29 @@ ...@@ -6318,6 +6336,29 @@
} }
} }
}, },
"dto.OrgClubGetPageReq": {
"type": "object",
"properties": {
"clubName": {
"description": "俱乐部名称",
"type": "string"
},
"createEndTime": {
"description": "结束时间",
"type": "string"
},
"createStartTime": {
"description": "开始时间",
"type": "string"
},
"pageIndex": {
"type": "integer"
},
"pageSize": {
"type": "integer"
}
}
},
"dto.OrgClubInsertReq": { "dto.OrgClubInsertReq": {
"type": "object", "type": "object",
"properties": { "properties": {
...@@ -6339,7 +6380,7 @@ ...@@ -6339,7 +6380,7 @@
"clubQrcode": { "clubQrcode": {
"type": "string" "type": "string"
}, },
"clubUserName": { "clubUsername": {
"type": "string" "type": "string"
}, },
"createBy": { "createBy": {
...@@ -6371,7 +6412,7 @@ ...@@ -6371,7 +6412,7 @@
"clubQrcode": { "clubQrcode": {
"type": "string" "type": "string"
}, },
"clubUserName": { "clubUsername": {
"type": "string" "type": "string"
}, },
"createBy": { "createBy": {
...@@ -7108,6 +7149,29 @@ ...@@ -7108,6 +7149,29 @@
} }
} }
}, },
"dto.OrgTeamGetPageReq": {
"type": "object",
"properties": {
"createEndTime": {
"description": "结束时间",
"type": "string"
},
"createStartTime": {
"description": "开始时间",
"type": "string"
},
"pageIndex": {
"type": "integer"
},
"pageSize": {
"type": "integer"
},
"teamName": {
"description": "球队名称",
"type": "string"
}
}
},
"dto.OrgTeamInsertReq": { "dto.OrgTeamInsertReq": {
"type": "object", "type": "object",
"properties": { "properties": {
...@@ -7201,6 +7265,12 @@ ...@@ -7201,6 +7265,12 @@
"name": { "name": {
"type": "string" "type": "string"
}, },
"name_en": {
"type": "string"
},
"roleId": {
"type": "string"
},
"sex": { "sex": {
"type": "string" "type": "string"
}, },
...@@ -7218,6 +7288,9 @@ ...@@ -7218,6 +7288,9 @@
}, },
"userImg": { "userImg": {
"type": "string" "type": "string"
},
"userName": {
"type": "string"
} }
} }
}, },
...@@ -8347,21 +8420,9 @@ ...@@ -8347,21 +8420,9 @@
"action": { "action": {
"type": "string" "type": "string"
}, },
"apis": {
"type": "array",
"items": {
"type": "integer"
}
},
"breadcrumb": { "breadcrumb": {
"type": "string" "type": "string"
}, },
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysMenu"
}
},
"component": { "component": {
"type": "string" "type": "string"
}, },
...@@ -8371,18 +8432,12 @@ ...@@ -8371,18 +8432,12 @@
"createdAt": { "createdAt": {
"type": "string" "type": "string"
}, },
"dataScope": {
"type": "string"
},
"icon": { "icon": {
"type": "string" "type": "string"
}, },
"isFrame": { "isFrame": {
"type": "string" "type": "string"
}, },
"is_select": {
"type": "boolean"
},
"menuId": { "menuId": {
"type": "integer" "type": "integer"
}, },
...@@ -8395,9 +8450,6 @@ ...@@ -8395,9 +8450,6 @@
"noCache": { "noCache": {
"type": "boolean" "type": "boolean"
}, },
"params": {
"type": "string"
},
"parentId": { "parentId": {
"type": "integer" "type": "integer"
}, },
...@@ -8410,9 +8462,6 @@ ...@@ -8410,9 +8462,6 @@
"permission": { "permission": {
"type": "string" "type": "string"
}, },
"roleId": {
"type": "integer"
},
"sort": { "sort": {
"type": "integer" "type": "integer"
}, },
......
docs/swagger.yaml
View file @ b17ad4e2
...@@ -54,6 +54,22 @@ definitions: ...@@ -54,6 +54,22 @@ definitions:
userId: userId:
type: string type: string
type: object type: object
dto.OrgClubGetPageReq:
properties:
clubName:
description: 俱乐部名称
type: string
createEndTime:
description: 结束时间
type: string
createStartTime:
description: 开始时间
type: string
pageIndex:
type: integer
pageSize:
type: integer
type: object
dto.OrgClubInsertReq: dto.OrgClubInsertReq:
properties: properties:
clubContacts: clubContacts:
...@@ -68,7 +84,7 @@ definitions: ...@@ -68,7 +84,7 @@ definitions:
type: string type: string
clubQrcode: clubQrcode:
type: string type: string
clubUserName: clubUsername:
type: string type: string
createBy: createBy:
type: integer type: integer
...@@ -89,7 +105,7 @@ definitions: ...@@ -89,7 +105,7 @@ definitions:
type: string type: string
clubQrcode: clubQrcode:
type: string type: string
clubUserName: clubUsername:
type: string type: string
createBy: createBy:
type: integer type: integer
...@@ -576,6 +592,22 @@ definitions: ...@@ -576,6 +592,22 @@ definitions:
updateBy: updateBy:
type: integer type: integer
type: object type: object
dto.OrgTeamGetPageReq:
properties:
createEndTime:
description: 结束时间
type: string
createStartTime:
description: 开始时间
type: string
pageIndex:
type: integer
pageSize:
type: integer
teamName:
description: 球队名称
type: string
type: object
dto.OrgTeamInsertReq: dto.OrgTeamInsertReq:
properties: properties:
clubId: clubId:
...@@ -637,6 +669,10 @@ definitions: ...@@ -637,6 +669,10 @@ definitions:
type: integer type: integer
name: name:
type: string type: string
name_en:
type: string
roleId:
type: string
sex: sex:
type: string type: string
signImg: signImg:
...@@ -649,6 +685,8 @@ definitions: ...@@ -649,6 +685,8 @@ definitions:
type: string type: string
userImg: userImg:
type: string type: string
userName:
type: string
type: object type: object
dto.PassWord: dto.PassWord:
properties: properties:
...@@ -1418,28 +1456,16 @@ definitions: ...@@ -1418,28 +1456,16 @@ definitions:
properties: properties:
action: action:
type: string type: string
apis:
items:
type: integer
type: array
breadcrumb: breadcrumb:
type: string type: string
children:
items:
$ref: '#/definitions/models.SysMenu'
type: array
component: component:
type: string type: string
createBy: createBy:
type: integer type: integer
createdAt: createdAt:
type: string type: string
dataScope:
type: string
icon: icon:
type: string type: string
is_select:
type: boolean
isFrame: isFrame:
type: string type: string
menuId: menuId:
...@@ -1450,8 +1476,6 @@ definitions: ...@@ -1450,8 +1476,6 @@ definitions:
type: string type: string
noCache: noCache:
type: boolean type: boolean
params:
type: string
parentId: parentId:
type: integer type: integer
path: path:
...@@ -1460,8 +1484,6 @@ definitions: ...@@ -1460,8 +1484,6 @@ definitions:
type: string type: string
permission: permission:
type: string type: string
roleId:
type: integer
sort: sort:
type: integer type: integer
sysApi: sysApi:
...@@ -2429,6 +2451,12 @@ paths: ...@@ -2429,6 +2451,12 @@ paths:
in: query in: query
name: pageIndex name: pageIndex
type: integer type: integer
- description: data
in: body
name: data
required: true
schema:
$ref: '#/definitions/dto.OrgClubGetPageReq'
responses: responses:
"200": "200":
description: '{"code": 200, "data": [...]}' description: '{"code": 200, "data": [...]}'
...@@ -3760,6 +3788,12 @@ paths: ...@@ -3760,6 +3788,12 @@ paths:
in: query in: query
name: pageIndex name: pageIndex
type: integer type: integer
- description: data
in: body
name: data
required: true
schema:
$ref: '#/definitions/dto.OrgTeamGetPageReq'
responses: responses:
"200": "200":
description: '{"code": 200, "data": [...]}' description: '{"code": 200, "data": [...]}'
......
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