Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
member-api
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
曲欣亮
member-api
Commits
0e7e45e3
Commit
0e7e45e3
authored
Nov 29, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
f719bb0a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
AdminFirstController.java
...va/com/egolm/film/api/web/admin/AdminFirstController.java
+3
-1
Fc_member_film.java
src/main/java/com/egolm/film/bean/Fc_member_film.java
+4
-4
No files found.
src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java
View file @
0e7e45e3
...
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
...
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.egolm.common.StringUtil
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.common.jdbc.Page
;
import
com.egolm.common.jdbc.Page
;
import
com.egolm.film.api.service.AdminTokenService
;
import
com.egolm.film.api.service.AdminTokenService
;
...
@@ -134,7 +135,8 @@ public class AdminFirstController {
...
@@ -134,7 +135,8 @@ public class AdminFirstController {
if
(
filmName
==
null
||
filmName
.
trim
().
length
()
==
0
)
{
if
(
filmName
==
null
||
filmName
.
trim
().
length
()
==
0
)
{
filmName
=
memberFilm
.
getCn_name
();
filmName
=
memberFilm
.
getCn_name
();
}
}
content
=
MessageFormat
.
format
(
content
,
member
.
getUsername
(),
memberFilm
.
getId
(),
filmName
==
null
?
""
:
filmName
);
String
film_no
=
StringUtil
.
formatLength
(
memberFilm
.
getFilm_no
(),
"000000"
);
content
=
MessageFormat
.
format
(
content
,
member
.
getUsername
(),
film_no
,
filmName
==
null
?
""
:
filmName
);
emailService
.
send
(
subject
,
content
,
member
.
getEmail
());
emailService
.
send
(
subject
,
content
,
member
.
getEmail
());
return
Rjx
.
jsonOk
().
set
(
"email"
,
member
.
getEmail
());
return
Rjx
.
jsonOk
().
set
(
"email"
,
member
.
getEmail
());
}
}
...
...
src/main/java/com/egolm/film/bean/Fc_member_film.java
View file @
0e7e45e3
...
@@ -18,7 +18,7 @@ public class Fc_member_film implements java.io.Serializable {
...
@@ -18,7 +18,7 @@ public class Fc_member_film implements java.io.Serializable {
/**
/**
* 电影编号
* 电影编号
*/
*/
private
String
film_no
;
private
Integer
film_no
;
/**
/**
* 原片名
* 原片名
...
@@ -363,7 +363,7 @@ public class Fc_member_film implements java.io.Serializable {
...
@@ -363,7 +363,7 @@ public class Fc_member_film implements java.io.Serializable {
* @param pass_time 通过时间
* @param pass_time 通过时间
* @param review_round 当前审片是第几轮
* @param review_round 当前审片是第几轮
*/
*/
public
Fc_member_film
(
Long
id
,
String
film_no
,
String
origion_name
,
String
en_name
,
String
cn_name
,
Integer
type
,
Long
film_group_id
,
Integer
film_type
,
String
film_type_name
,
String
show_date
,
Long
show_time
,
String
first_show_date
,
String
first_show_city
,
Integer
is_apply_other_filmfest
,
String
other_filmfest_name
,
String
film_medium
,
String
film_format
,
String
completion_date
,
String
film_country
,
String
co_production_country
,
String
film_producers
,
String
production_company
,
String
enroll_type_name
,
Integer
enroll_type
,
Integer
is_like_show
,
Long
create_time
,
Integer
member_id
,
String
create_ip
,
Integer
state
,
String
prize
,
String
dialogue_lang
,
String
subtitle_lang
,
String
play_shanghai
,
String
has_joined_award
,
String
intro
,
String
en_intro
,
Long
last_modify_time
,
String
film_side_demand
,
String
film_total_time
,
Integer
is_show
,
String
film_apply_company
,
String
film_apply_realname
,
String
film_apply_email
,
String
film_apply_tel
,
String
film_apply_mobile
,
String
film_apply_country
,
String
enroll_type_name_other
,
String
film_format_url
,
String
film_format_passw
,
String
film_format_other
,
String
film_type_name_short
,
String
lang
,
Integer
apply_state
,
String
film_district
,
Integer
is_check_director
,
Long
pass_time
,
Integer
review_round
)
{
public
Fc_member_film
(
Long
id
,
Integer
film_no
,
String
origion_name
,
String
en_name
,
String
cn_name
,
Integer
type
,
Long
film_group_id
,
Integer
film_type
,
String
film_type_name
,
String
show_date
,
Long
show_time
,
String
first_show_date
,
String
first_show_city
,
Integer
is_apply_other_filmfest
,
String
other_filmfest_name
,
String
film_medium
,
String
film_format
,
String
completion_date
,
String
film_country
,
String
co_production_country
,
String
film_producers
,
String
production_company
,
String
enroll_type_name
,
Integer
enroll_type
,
Integer
is_like_show
,
Long
create_time
,
Integer
member_id
,
String
create_ip
,
Integer
state
,
String
prize
,
String
dialogue_lang
,
String
subtitle_lang
,
String
play_shanghai
,
String
has_joined_award
,
String
intro
,
String
en_intro
,
Long
last_modify_time
,
String
film_side_demand
,
String
film_total_time
,
Integer
is_show
,
String
film_apply_company
,
String
film_apply_realname
,
String
film_apply_email
,
String
film_apply_tel
,
String
film_apply_mobile
,
String
film_apply_country
,
String
enroll_type_name_other
,
String
film_format_url
,
String
film_format_passw
,
String
film_format_other
,
String
film_type_name_short
,
String
lang
,
Integer
apply_state
,
String
film_district
,
Integer
is_check_director
,
Long
pass_time
,
Integer
review_round
)
{
this
.
id
=
id
;
this
.
id
=
id
;
this
.
film_no
=
film_no
;
this
.
film_no
=
film_no
;
this
.
origion_name
=
origion_name
;
this
.
origion_name
=
origion_name
;
...
@@ -431,11 +431,11 @@ public class Fc_member_film implements java.io.Serializable {
...
@@ -431,11 +431,11 @@ public class Fc_member_film implements java.io.Serializable {
return
id
;
return
id
;
}
}
public
void
setFilm_no
(
String
film_no
)
{
public
void
setFilm_no
(
Integer
film_no
)
{
this
.
film_no
=
film_no
;
this
.
film_no
=
film_no
;
}
}
public
String
getFilm_no
()
{
public
Integer
getFilm_no
()
{
return
film_no
;
return
film_no
;
}
}
...
...
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