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
e5435c90
Commit
e5435c90
authored
Nov 24, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xx
parent
5fcc3dfb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
26 deletions
+4
-26
FilmController.java
src/main/java/com/egolm/film/api/web/FilmController.java
+4
-2
MemberApplyController.java
.../com/egolm/film/api/web/member/MemberApplyController.java
+0
-24
No files found.
src/main/java/com/egolm/film/api/web/FilmController.java
View file @
e5435c90
...
...
@@ -34,6 +34,7 @@ public class FilmController {
@PostMapping
(
"get_detail"
)
@ApiOperation
(
"获取全部申报信息"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
paramType
=
"header"
,
dataType
=
"string"
,
name
=
"i18n_language"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"long"
,
required
=
true
,
name
=
"member_film_id"
,
value
=
"申报影片ID"
)
})
public
Object
getDetail
(
Long
member_film_id
)
{
...
...
@@ -41,6 +42,7 @@ public class FilmController {
List
<
Fc_member_film_issuer
>
issuerList
=
memberFilmService
.
queryMemberFilmIssuerList
(
memberFilm
.
getId
());
List
<
Fc_member_film_playactor
>
playactorList
=
memberFilmService
.
queryMemberFilmPlayactorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
memberFilmService
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
return
Rjx
.
jsonOk
()
.
setData
(
memberFilm
)
.
set
(
"issuerList"
,
issuerList
)
...
...
src/main/java/com/egolm/film/api/web/member/MemberApplyController.java
View file @
e5435c90
...
...
@@ -14,11 +14,7 @@ import com.egolm.common.bean.Rjx;
import
com.egolm.film.api.service.FilmService
;
import
com.egolm.film.api.service.MemberService
;
import
com.egolm.film.api.service.MemberTokenService
;
import
com.egolm.film.bean.Fc_member_film
;
import
com.egolm.film.bean.Fc_member_film_all
;
import
com.egolm.film.bean.Fc_member_film_issuer
;
import
com.egolm.film.bean.Fc_member_film_playactor
;
import
com.egolm.film.bean.Fc_member_film_show
;
import
com.egolm.film.model.LoginToken
;
import
io.swagger.annotations.Api
;
...
...
@@ -210,26 +206,6 @@ public class MemberApplyController {
return
Rjx
.
jsonOk
();
}
@ResponseBody
@PostMapping
(
"get_detail"
)
@ApiOperation
(
"获取全部申报信息"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
paramType
=
"header"
,
dataType
=
"string"
,
name
=
"i18n_language"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"long"
,
required
=
true
,
name
=
"member_film_id"
,
value
=
"申报影片ID"
)
})
public
Object
getDetail
(
Long
member_film_id
)
{
Fc_member_film
memberFilm
=
memberFilmService
.
queryMemberFilmById
(
member_film_id
);
List
<
Fc_member_film_issuer
>
issuerList
=
memberFilmService
.
queryMemberFilmIssuerList
(
memberFilm
.
getId
());
List
<
Fc_member_film_playactor
>
playactorList
=
memberFilmService
.
queryMemberFilmPlayactorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
memberFilmService
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
return
Rjx
.
jsonOk
()
.
setData
(
memberFilm
)
.
set
(
"issuerList"
,
issuerList
)
.
set
(
"playactorList"
,
playactorList
)
.
set
(
"showList"
,
showList
);
}
@ResponseBody
@PostMapping
(
"do_apply"
)
@ApiOperation
(
"提交申报"
)
...
...
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