Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nbya
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoyanbin
nbya
Commits
f1b3496a
Commit
f1b3496a
authored
3 years ago
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug
parent
d9deee2b
master
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
org_team_team.go
app/operate/service/dto/org_team_team.go
+2
-2
org_match_evaluate.go
app/operate/service/org_match_evaluate.go
+2
-2
org_team_match_evaluate.go
app/operate/service/org_team_match_evaluate.go
+1
-1
org_team_team.go
app/operate/service/org_team_team.go
+1
-2
No files found.
app/operate/service/dto/org_team_team.go
View file @
f1b3496a
...
...
@@ -7,11 +7,11 @@ import (
type
OrgTeamTeamGetPageReq
struct
{
dto
.
Pagination
`search:"-"`
TeamId
string
`form:"teamId" search:"type:exact;column:team_id;table:o
t
" comment:""`
TeamId
string
`form:"teamId" search:"type:exact;column:team_id;table:o
mtp
" 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:""`
Rounds
string
`form:"rounds" search:"type:exact;column:rounds;table:om
tp
" comment:""`
}
type
OrgTeamTeamGetPageReply
struct
{
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/org_match_evaluate.go
View file @
f1b3496a
...
...
@@ -28,7 +28,7 @@ func (e *OrgMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *actions
"ome.remark"
err
=
e
.
Orm
.
Table
(
"org_match_team_player as omtp"
)
.
Select
(
field
)
.
Joins
(
"left join org_match_evaluate as ome on omtp.match_id = ome.id and omtp.rounds = ome.rounds"
)
.
Joins
(
"left join org_match_evaluate as ome on omtp.match_id = ome.id and omtp.rounds = ome.rounds
and omtp.player_id = ome.player_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"
)
.
...
...
@@ -57,7 +57,7 @@ func (e *OrgMatchEvaluate) GetMatchInfo(id string, p *actions.DataPermission, da
"oc.club_name, ot.team_name, omtp.player_name, omtp.player_number, omtp.position,"
+
"ome.id as evaluate_id, omtp.player_id, om.season_id,"
+
"ota.team_name as team_a_name, otb.team_name as team_b_name"
)
.
Joins
(
"left join org_match_evaluate as ome on omtp.match_id = ome.match_id and omtp.rounds=ome.rounds"
)
.
Joins
(
"left join org_match_evaluate as ome on omtp.match_id = ome.match_id and omtp.rounds=ome.rounds
and 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 and omtp.rounds = om.rounds"
)
.
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/org_team_match_evaluate.go
View file @
f1b3496a
...
...
@@ -27,7 +27,7 @@ func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgTeamMatchEvaluateGetPageReq, p
"ome.mv_status, ome.status, ome.remark"
err
=
e
.
Orm
.
Table
(
"org_match_team_player as omtp"
)
.
Select
(
field
)
.
Joins
(
"left join org_match_evaluate as ome on omtp.player_id = ome.player_id"
)
.
Joins
(
"left join org_match_evaluate as ome on omtp.
match_id = ome.match_id and omtp.rounds = ome.rounds and omtp.
player_id = ome.player_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"
)
.
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/org_team_team.go
View file @
f1b3496a
...
...
@@ -22,7 +22,6 @@ type OrgTeamTeam struct {
// GetPage 获取OrgMatch列表
func
(
e
*
OrgTeamTeam
)
GetPage
(
c
*
dto
.
OrgTeamTeamGetPageReq
,
p
*
actions
.
DataPermission
,
list
*
[]
dto
.
OrgTeamTeamGetPageReply
,
count
*
int64
)
error
{
var
err
error
var
data
models
.
OrgMatch
err
=
e
.
Orm
.
Table
(
"org_match_team_player as omtp"
)
.
Select
(
"omtp.team_id, ol.league_name, om.season_id, os.season_name, omtp.rounds,"
+
...
...
@@ -34,7 +33,7 @@ func (e *OrgTeamTeam) GetPage(c *dto.OrgTeamTeamGetPageReq, p *actions.DataPermi
Scopes
(
cDto
.
MakeCondition
(
c
.
GetNeedSearch
()),
cDto
.
Paginate
(
c
.
GetPageSize
(),
c
.
GetPageIndex
()),
actions
.
Permission
(
data
.
TableName
()
,
p
),
actions
.
Permission
(
"otmp"
,
p
),
cDto
.
PassDel
(
"omtp"
),
)
.
Where
(
"omtp.team_id=?"
,
c
.
TeamId
)
.
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment