Commit 10535be2 authored by Quxl's avatar Quxl

x

parent afd7bd35
...@@ -586,10 +586,11 @@ public class ExportServiceImpl implements ExportService { ...@@ -586,10 +586,11 @@ public class ExportServiceImpl implements ExportService {
Map<String, String> stringVars = new HashMap<String, String>(); Map<String, String> stringVars = new HashMap<String, String>();
stringVars.put("1,1", film.getCn_name()); stringVars.put("1,1", film.getCn_name());
stringVars.put("2,1", film.getEn_name()); stringVars.put("2,1", film.getEn_name());
stringVars.put("3,1", filmExt.getDirector_en());
stringVars.put("6,1", film.getFilm_country()); stringVars.put("6,1", film.getFilm_country());
stringVars.put("7,1", film.getCompletion_date()); stringVars.put("7,1", film.getCompletion_date());
stringVars.put("8,1", film.getFilm_total_time()); stringVars.put("8,1", film.getFilm_total_time());
if(filmExt != null) {
stringVars.put("3,1", filmExt.getDirector_en());
stringVars.put("9,1", ExportConstant.fmtopts.get(String.valueOf(filmExt.getFormat()))); stringVars.put("9,1", ExportConstant.fmtopts.get(String.valueOf(filmExt.getFormat())));
stringVars.put("11,1", filmExt.getScreenplay()); stringVars.put("11,1", filmExt.getScreenplay());
stringVars.put("13,1", filmExt.getDirector_of_photography()); stringVars.put("13,1", filmExt.getDirector_of_photography());
...@@ -612,6 +613,7 @@ public class ExportServiceImpl implements ExportService { ...@@ -612,6 +613,7 @@ public class ExportServiceImpl implements ExportService {
stringVars.put("24,5", filmExt.getDirector_biography_en()); stringVars.put("24,5", filmExt.getDirector_biography_en());
stringVars.put("19,5", filmExt.getDirector_cn()); stringVars.put("19,5", filmExt.getDirector_cn());
stringVars.put("23,5", filmExt.getDirector_en()); stringVars.put("23,5", filmExt.getDirector_en());
}
for(String key : stringVars.keySet()) { for(String key : stringVars.keySet()) {
String value = stringVars.get(key); String value = stringVars.get(key);
value = value == null ? "" : value.trim(); value = value == null ? "" : value.trim();
...@@ -636,8 +638,10 @@ public class ExportServiceImpl implements ExportService { ...@@ -636,8 +638,10 @@ public class ExportServiceImpl implements ExportService {
} }
Map<String, String> photoVars = new HashMap<String, String>(); Map<String, String> photoVars = new HashMap<String, String>();
if(filmExt != null) {
photoVars.put("1,4,10,4", filmExt.getPhoto_mv()); photoVars.put("1,4,10,4", filmExt.getPhoto_mv());
photoVars.put("3,19,4,26", filmExt.getPhoto_director()); photoVars.put("3,19,4,26", filmExt.getPhoto_director());
}
HSSFPatriarch patriarch = sheet.createDrawingPatriarch(); HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
for(String key : photoVars.keySet()) { for(String key : photoVars.keySet()) {
if(StringUtil.isNotBlank(key)) { if(StringUtil.isNotBlank(key)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment