Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
sentinel
Project
Project
Details
Activity
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
曲欣亮
sentinel
Commits
af605aae
Commit
af605aae
authored
Jan 09, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
18dcca3c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
AdminFirstController.java
...va/com/egolm/film/api/web/admin/AdminFirstController.java
+3
-0
Fc_member_film.java
src/main/java/com/egolm/film/bean/Fc_member_film.java
+11
-0
No files found.
src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java
View file @
af605aae
...
@@ -121,8 +121,11 @@ public class AdminFirstController {
...
@@ -121,8 +121,11 @@ public class AdminFirstController {
public
Object
pass
(
Long
member_film_id
,
String
film_type_name_short
)
{
public
Object
pass
(
Long
member_film_id
,
String
film_type_name_short
)
{
memberFilmService
.
verifyFilmDuplicate
(
member_film_id
);
memberFilmService
.
verifyFilmDuplicate
(
member_film_id
);
Fc_member_film
film
=
new
Fc_member_film
();
Fc_member_film
film
=
new
Fc_member_film
();
LoginToken
token
=
tokenService
.
getToken
();
Integer
adminid
=
(
Integer
)
token
.
getId
();
film
.
setId
(
member_film_id
);
film
.
setId
(
member_film_id
);
film
.
setFilm_type_name_short
(
film_type_name_short
);
film
.
setFilm_type_name_short
(
film_type_name_short
);
film
.
setFirst_admin_id
(
adminid
);
memberFilmService
.
mergeMemberFilm
(
film
);
memberFilmService
.
mergeMemberFilm
(
film
);
memberFilmService
.
pass
(
member_film_id
);
memberFilmService
.
pass
(
member_film_id
);
reviewService
.
toFirstRound
(
member_film_id
);
reviewService
.
toFirstRound
(
member_film_id
);
...
...
src/main/java/com/egolm/film/bean/Fc_member_film.java
View file @
af605aae
...
@@ -185,6 +185,9 @@ public class Fc_member_film implements java.io.Serializable {
...
@@ -185,6 +185,9 @@ public class Fc_member_film implements java.io.Serializable {
@Column
(
columnDefinition
=
"bigint(20) unsigned COMMENT '通过时间'"
)
@Column
(
columnDefinition
=
"bigint(20) unsigned COMMENT '通过时间'"
)
private
Long
pass_time
;
private
Long
pass_time
;
@Column
(
columnDefinition
=
"int(11) COMMENT '初审管理员ID '"
)
private
Integer
first_admin_id
;
@Column
(
columnDefinition
=
"varchar(64) COMMENT '上传影片标记'"
)
@Column
(
columnDefinition
=
"varchar(64) COMMENT '上传影片标记'"
)
private
String
upload_id
;
private
String
upload_id
;
...
@@ -693,6 +696,14 @@ public class Fc_member_film implements java.io.Serializable {
...
@@ -693,6 +696,14 @@ public class Fc_member_film implements java.io.Serializable {
return
pass_time
;
return
pass_time
;
}
}
public
void
setFirst_admin_id
(
Integer
first_admin_id
)
{
this
.
first_admin_id
=
first_admin_id
;
}
public
Integer
getFirst_admin_id
()
{
return
first_admin_id
;
}
public
void
setUpload_id
(
String
upload_id
)
{
public
void
setUpload_id
(
String
upload_id
)
{
this
.
upload_id
=
upload_id
;
this
.
upload_id
=
upload_id
;
}
}
...
...
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