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
a8f33c76
Commit
a8f33c76
authored
Mar 06, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
95590d27
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
ExportService.java
src/main/java/com/egolm/film/api/service/ExportService.java
+3
-1
ExportServiceImpl.java
...va/com/egolm/film/api/service/impl/ExportServiceImpl.java
+2
-3
FilmGroupController.java
...ava/com/egolm/film/api/web/admin/FilmGroupController.java
+1
-1
No files found.
src/main/java/com/egolm/film/api/service/ExportService.java
View file @
a8f33c76
...
@@ -5,6 +5,8 @@ import java.util.Map;
...
@@ -5,6 +5,8 @@ import java.util.Map;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.ServletOutputStream
;
import
com.egolm.film.bean.Fc_member_film
;
public
interface
ExportService
{
public
interface
ExportService
{
Map
<
String
,
String
>
getApplyListColumns
();
Map
<
String
,
String
>
getApplyListColumns
();
...
@@ -17,6 +19,6 @@ public interface ExportService {
...
@@ -17,6 +19,6 @@ public interface ExportService {
Map
<
String
,
String
>
getReviewPassListColumns
();
Map
<
String
,
String
>
getReviewPassListColumns
();
void
exportReviewPassList
(
ServletOutputStream
os
,
String
[]
columns
,
List
<
Map
<
String
,
Object
>>
list
);
void
exportReviewPassList
(
ServletOutputStream
os
,
String
[]
columns
,
List
<
Map
<
String
,
Object
>>
list
);
void
exportPublication
(
ServletOutputStream
os
,
Integer
film_id
);
void
exportPublication
(
ServletOutputStream
os
,
Fc_member_film
film
);
}
}
src/main/java/com/egolm/film/api/service/impl/ExportServiceImpl.java
View file @
a8f33c76
...
@@ -561,9 +561,8 @@ public class ExportServiceImpl implements ExportService {
...
@@ -561,9 +561,8 @@ public class ExportServiceImpl implements ExportService {
OssService
ossService
;
OssService
ossService
;
@Override
@Override
public
void
exportPublication
(
ServletOutputStream
os
,
Integer
film_id
)
{
public
void
exportPublication
(
ServletOutputStream
os
,
Fc_member_film
film
)
{
Fc_member_film
film
=
filmService
.
queryMemberFilmById
(
film_id
.
longValue
());
Fc_member_film_ext
filmExt
=
filmService
.
queryFilmExt
(
film
.
getId
().
intValue
());
Fc_member_film_ext
filmExt
=
filmService
.
queryFilmExt
(
film_id
);
Map
<
String
,
String
>
vars
=
new
HashMap
<
String
,
String
>();
Map
<
String
,
String
>
vars
=
new
HashMap
<
String
,
String
>();
vars
.
put
(
"1,0"
,
film
.
getCn_name
());
vars
.
put
(
"1,0"
,
film
.
getCn_name
());
vars
.
put
(
"2,0"
,
film
.
getEn_name
());
vars
.
put
(
"2,0"
,
film
.
getEn_name
());
...
...
src/main/java/com/egolm/film/api/web/admin/FilmGroupController.java
View file @
a8f33c76
...
@@ -108,7 +108,7 @@ public class FilmGroupController {
...
@@ -108,7 +108,7 @@ public class FilmGroupController {
String
filmNoString
=
StringUtil
.
formatLength
(
film
.
getFilm_no
(),
"0000"
);
String
filmNoString
=
StringUtil
.
formatLength
(
film
.
getFilm_no
(),
"0000"
);
response
.
setContentType
(
"application/octet-stream"
);
response
.
setContentType
(
"application/octet-stream"
);
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
"会刊["
+
filmNoString
+
"].xls"
,
"UTF-8"
));
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
"会刊["
+
filmNoString
+
"].xls"
,
"UTF-8"
));
exportService
.
exportPublication
(
response
.
getOutputStream
(),
film
_id
);
exportService
.
exportPublication
(
response
.
getOutputStream
(),
film
);
}
}
@ResponseBody
@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