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
09d5bf4f
Commit
09d5bf4f
authored
Apr 19, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
f9f91017
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
AdminFirstController.java
...va/com/egolm/film/api/web/admin/AdminFirstController.java
+3
-3
FilmGroupController.java
...ava/com/egolm/film/api/web/admin/FilmGroupController.java
+3
-3
No files found.
src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java
View file @
09d5bf4f
...
@@ -15,9 +15,9 @@ import org.slf4j.LoggerFactory;
...
@@ -15,9 +15,9 @@ import org.slf4j.LoggerFactory;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
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.RequestMethod
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.egolm.common.DateUtil
;
import
com.egolm.common.DateUtil
;
...
@@ -260,7 +260,7 @@ public class AdminFirstController {
...
@@ -260,7 +260,7 @@ public class AdminFirstController {
return
Rjx
.
jsonOk
().
setData
(
exportService
.
getApplyListColumns
());
return
Rjx
.
jsonOk
().
setData
(
exportService
.
getApplyListColumns
());
}
}
@
GetMapping
(
"exportApplyList"
)
@
RequestMapping
(
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
value
=
"exportApplyList"
)
@ApiOperation
(
"导出报名列表"
)
@ApiOperation
(
"导出报名列表"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
false
,
name
=
"keyword"
,
value
=
"关键字"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
false
,
name
=
"keyword"
,
value
=
"关键字"
),
...
@@ -300,7 +300,7 @@ public class AdminFirstController {
...
@@ -300,7 +300,7 @@ public class AdminFirstController {
return
Rjx
.
jsonOk
().
setData
(
exportService
.
getApplyPassListColumns
());
return
Rjx
.
jsonOk
().
setData
(
exportService
.
getApplyPassListColumns
());
}
}
@
GetMapping
(
"exportApplyPassList"
)
@
RequestMapping
(
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
value
=
"exportApplyPassList"
)
@ApiOperation
(
"导出影片列表"
)
@ApiOperation
(
"导出影片列表"
)
public
void
exportApplyPassList
(
public
void
exportApplyPassList
(
String
keyword
,
String
film_country
,
String
play_shanghai
,
String
keyword
,
String
film_country
,
String
play_shanghai
,
...
...
src/main/java/com/egolm/film/api/web/admin/FilmGroupController.java
View file @
09d5bf4f
...
@@ -11,9 +11,9 @@ import javax.servlet.http.HttpServletResponse;
...
@@ -11,9 +11,9 @@ import javax.servlet.http.HttpServletResponse;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
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.RequestMethod
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.egolm.common.DateUtil
;
import
com.egolm.common.DateUtil
;
...
@@ -92,7 +92,7 @@ public class FilmGroupController {
...
@@ -92,7 +92,7 @@ public class FilmGroupController {
return
Rjx
.
jsonOk
().
setData
(
exportService
.
getReviewPassListColumns
());
return
Rjx
.
jsonOk
().
setData
(
exportService
.
getReviewPassListColumns
());
}
}
@
GetMapping
(
"exportReviewPassList"
)
@
RequestMapping
(
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
value
=
"exportReviewPassList"
)
@ApiOperation
(
"导出统计查询列表"
)
@ApiOperation
(
"导出统计查询列表"
)
public
void
exportApplyPassList
(
Integer
[]
group_id
,
String
keyword
,
Integer
enroll_type_id
,
Integer
film_type_name
,
Integer
film_type_name_short
,
Integer
play_shanghai
,
Integer
is_important
,
Integer
review_state
,
Integer
review_round
,
String
film_country
,
String
[]
orderBy
,
Long
index
,
Long
limit
,
HttpServletResponse
response
,
String
[]
columns
)
throws
IOException
{
public
void
exportApplyPassList
(
Integer
[]
group_id
,
String
keyword
,
Integer
enroll_type_id
,
Integer
film_type_name
,
Integer
film_type_name_short
,
Integer
play_shanghai
,
Integer
is_important
,
Integer
review_state
,
Integer
review_round
,
String
film_country
,
String
[]
orderBy
,
Long
index
,
Long
limit
,
HttpServletResponse
response
,
String
[]
columns
)
throws
IOException
{
response
.
setContentType
(
"application/octet-stream"
);
response
.
setContentType
(
"application/octet-stream"
);
...
@@ -101,7 +101,7 @@ public class FilmGroupController {
...
@@ -101,7 +101,7 @@ public class FilmGroupController {
exportService
.
exportReviewPassList
(
response
.
getOutputStream
(),
columns
,
list
);
exportService
.
exportReviewPassList
(
response
.
getOutputStream
(),
columns
,
list
);
}
}
@
GetMapping
(
"exportPublication"
)
@
RequestMapping
(
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
value
=
"exportPublication"
)
@ApiOperation
(
"导出会刊"
)
@ApiOperation
(
"导出会刊"
)
public
void
exportPublication
(
Integer
film_id
,
HttpServletResponse
response
)
throws
IOException
{
public
void
exportPublication
(
Integer
film_id
,
HttpServletResponse
response
)
throws
IOException
{
Fc_member_film
film
=
filmService
.
queryMemberFilmById
(
film_id
.
longValue
());
Fc_member_film
film
=
filmService
.
queryMemberFilmById
(
film_id
.
longValue
());
...
...
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