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
c73565e3
Commit
c73565e3
authored
Jan 24, 2022
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fileId
parent
dc1b9ed8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
16 deletions
+26
-16
org_match_evaluate.go
app/operate/apis/org_match_evaluate.go
+8
-4
org_match_evaluate_wonderful.go
app/operate/models/org_match_evaluate_wonderful.go
+12
-11
org_match_evaluate_wonderful.go
app/operate/service/dto/org_match_evaluate_wonderful.go
+4
-0
org_match_evaluate.go
app/operate/service/org_match_evaluate.go
+1
-1
match.go
common/dto/match.go
+1
-0
No files found.
app/operate/apis/org_match_evaluate.go
View file @
c73565e3
...
...
@@ -234,8 +234,9 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
reqWonderfulUpdate
.
Id
=
upId
reqWonderfulUpdate
.
WonderfulUrl
=
v
.
WonderfulUrl
reqWonderfulUpdate
.
WonderfulTitle
=
v
.
WonderfulTitle
reqWonderfulUpdate
.
FileId
=
v
.
FileId
reqWonderfulUpdate
.
UpdateBy
=
user
.
GetUserId
(
c
)
reqWonderfulUpdate
.
SetUpdateBy
(
user
.
GetUserId
(
c
))
sWonderful
.
Update
(
&
reqWonderfulUpdate
)
delIds
=
append
(
delIds
,
upId
)
}
else
{
...
...
@@ -243,8 +244,9 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
reqWonderfulInsert
.
MatchEvaluateId
=
strconv
.
Itoa
(
eId
)
reqWonderfulInsert
.
WonderfulUrl
=
v
.
WonderfulUrl
reqWonderfulInsert
.
WonderfulTitle
=
v
.
WonderfulTitle
reqWonderfulUpdate
.
FileId
=
v
.
FileId
reqWonderfulInsert
.
CreateBy
=
user
.
GetUserId
(
c
)
reqWonderfulInsert
.
SetCreateBy
(
user
.
GetUserId
(
c
))
sWonderful
.
Insert
(
&
reqWonderfulInsert
)
delIds
=
append
(
delIds
,
reqWonderfulInsert
.
Id
)
}
...
...
@@ -255,8 +257,9 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
reqWonderfulUpdate
.
Id
=
upId
reqWonderfulUpdate
.
WonderfulUrl
=
vMv
.
WonderfulUrl
reqWonderfulUpdate
.
WonderfulTitle
=
vMv
.
WonderfulTitle
reqWonderfulUpdate
.
FileId
=
vMv
.
FileId
reqWonderfulUpdate
.
UpdateBy
=
user
.
GetUserId
(
c
)
reqWonderfulUpdate
.
SetUpdateBy
(
user
.
GetUserId
(
c
))
sWonderful
.
Update
(
&
reqWonderfulUpdate
)
delIds
=
append
(
delIds
,
upId
)
...
...
@@ -265,8 +268,9 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
reqWonderfulInsert
.
MatchEvaluateId
=
strconv
.
Itoa
(
eId
)
reqWonderfulInsert
.
WonderfulUrl
=
vMv
.
WonderfulUrl
reqWonderfulInsert
.
WonderfulTitle
=
vMv
.
WonderfulTitle
reqWonderfulUpdate
.
FileId
=
vMv
.
FileId
reqWonderfulInsert
.
CreateBy
=
user
.
GetUserId
(
c
)
reqWonderfulInsert
.
SetCreateBy
(
user
.
GetUserId
(
c
))
sWonderful
.
Insert
(
&
reqWonderfulInsert
)
delIds
=
append
(
delIds
,
reqWonderfulInsert
.
Id
)
}
...
...
app/operate/models/org_match_evaluate_wonderful.go
View file @
c73565e3
...
...
@@ -12,6 +12,7 @@ type OrgMatchEvaluateWonderful struct {
MatchEvaluateId
string
`json:"matchEvaluateId" gorm:"type:bigint(20);comment:MatchEvaluateId"`
WonderfulUrl
string
`json:"wonderfulUrl" gorm:"type:varchar(255);comment:精彩时刻url"`
WonderfulTitle
string
`json:"wonderfulTitle" gorm:"type:varchar(255);comment:精彩时刻标题"`
FileId
string
`json:"fileId" gorm:"type:varchar(30);comment:文件id"`
Type
string
`json:"type" gorm:"type:bigint(20);comment:1 图片 2 视频"`
models
.
ModelTime
models
.
ControlBy
...
...
app/operate/service/dto/org_match_evaluate_wonderful.go
View file @
c73565e3
...
...
@@ -34,6 +34,7 @@ type OrgMatchEvaluateWonderfulInsertReq struct {
MatchEvaluateId
string
`json:"matchEvaluateId" comment:""`
WonderfulUrl
string
`json:"wonderfulUrl" comment:"精彩时刻url"`
WonderfulTitle
string
`json:"wonderfulTitle" comment:"精彩时刻标题"`
FileId
string
`json:"fileId" comment:"文件id"`
Type
string
`json:"type" comment:"1 图片 2 视频"`
common
.
ControlBy
}
...
...
@@ -45,6 +46,7 @@ func (s *OrgMatchEvaluateWonderfulInsertReq) Generate(model *models.OrgMatchEval
model
.
MatchEvaluateId
=
s
.
MatchEvaluateId
model
.
WonderfulUrl
=
s
.
WonderfulUrl
model
.
WonderfulTitle
=
s
.
WonderfulTitle
model
.
FileId
=
s
.
FileId
model
.
Type
=
s
.
Type
}
...
...
@@ -57,6 +59,7 @@ type OrgMatchEvaluateWonderfulUpdateReq struct {
MatchEvaluateId
string
`json:"matchEvaluateId" comment:""`
WonderfulUrl
string
`json:"wonderfulUrl" comment:"精彩时刻url"`
WonderfulTitle
string
`json:"wonderfulTitle" comment:"精彩时刻标题"`
FileId
string
`json:"fileId" comment:"文件id"`
Type
string
`json:"type" comment:"1 图片 2 视频"`
common
.
ControlBy
}
...
...
@@ -68,6 +71,7 @@ func (s *OrgMatchEvaluateWonderfulUpdateReq) Generate(model *models.OrgMatchEval
model
.
MatchEvaluateId
=
s
.
MatchEvaluateId
model
.
WonderfulUrl
=
s
.
WonderfulUrl
model
.
WonderfulTitle
=
s
.
WonderfulTitle
model
.
FileId
=
s
.
FileId
model
.
Type
=
s
.
Type
}
...
...
app/operate/service/org_match_evaluate.go
View file @
c73565e3
...
...
@@ -82,7 +82,7 @@ func (e *OrgMatchEvaluate) GetPageWonderful(evaluateId string, list *[]cDto.Wond
var
err
error
err
=
e
.
Orm
.
Table
(
"org_match_evaluate_wonderful as omew"
)
.
Select
(
"omew.id as wonderful_id, omew.wonderful_url, omew.wonderful_title"
)
.
Select
(
"omew.id as wonderful_id, omew.wonderful_url, omew.wonderful_title
, omew.file_id
"
)
.
Scopes
(
cDto
.
PassDel
(
"omew"
),
)
.
...
...
common/dto/match.go
View file @
c73565e3
...
...
@@ -27,6 +27,7 @@ type Wonderful struct {
WonderfulId
string
`json:"wonderfulId" comment:"精彩时刻id"`
WonderfulUrl
string
`json:"wonderfulUrl" comment:"精彩时刻url"`
WonderfulTitle
string
`json:"wonderfulTitle" comment:"精彩时刻标题"`
FileId
string
`json:"fileId" comment:"文件id"`
}
type
TotalScoring
struct
{
...
...
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