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
2e792b28
Commit
2e792b28
authored
Dec 07, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
89fb206a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
FilmService.java
src/main/java/com/egolm/film/api/service/FilmService.java
+1
-1
FilmServiceImpl.java
...java/com/egolm/film/api/service/impl/FilmServiceImpl.java
+2
-1
AdminFirstController.java
...va/com/egolm/film/api/web/admin/AdminFirstController.java
+1
-1
No files found.
src/main/java/com/egolm/film/api/service/FilmService.java
View file @
2e792b28
...
...
@@ -95,7 +95,7 @@ public interface FilmService {
List
<
Map
<
String
,
Object
>>
queryChuShenList
(
String
keyword
,
Integer
state
,
Integer
apply_state
,
Integer
upload_state
,
Integer
film_type
,
Integer
enroll_type
,
String
film_country
,
Integer
film_type_short
,
Page
page
);
void
pass
(
Long
member_film_id
);
Integer
pass
(
Long
member_film_id
);
void
reject
(
Long
member_film_id
,
String
apply_state_intro
);
...
...
src/main/java/com/egolm/film/api/service/impl/FilmServiceImpl.java
View file @
2e792b28
...
...
@@ -376,11 +376,12 @@ public class FilmServiceImpl implements FilmService {
}
@Override
public
synchronized
void
pass
(
Long
member_film_id
)
{
public
synchronized
Integer
pass
(
Long
member_film_id
)
{
this
.
updateEnroll
(
member_film_id
);
Integer
film_no
=
jdbcTemplate
.
queryForInt
(
"select ifnull(max(film_no), 0) + 1 from fc_member_film"
);
String
sql
=
"update fc_member_film set film_no = ?, apply_state = ?, upload_state = ?, pass_time = ? where id = ?"
;
jdbcTemplate
.
executeUpdate
(
sql
,
film_no
,
2
,
0
,
System
.
currentTimeMillis
()/
1000L
,
member_film_id
);
return
film_no
;
}
@Override
...
...
src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java
View file @
2e792b28
...
...
@@ -145,7 +145,7 @@ public class AdminFirstController {
String
film_no
=
StringUtil
.
formatLength
(
memberFilm
.
getFilm_no
(),
"0000"
);
content
=
MessageFormat
.
format
(
content
,
member
.
getUsername
(),
film_no
,
filmName
==
null
?
""
:
filmName
);
emailService
.
send
(
subject
,
content
,
member
.
getEmail
());
return
Rjx
.
jsonOk
().
set
(
"email"
,
member
.
getEmail
());
return
Rjx
.
jsonOk
().
set
(
"email"
,
member
.
getEmail
())
.
set
(
"film_no"
,
memberFilm
.
getFilm_no
())
;
}
@ResponseBody
...
...
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