Commit 3720e9c3 authored by Quxl's avatar Quxl

x

parent cfcc8cbe
...@@ -105,7 +105,7 @@ public class ExportServiceImpl implements ExportService { ...@@ -105,7 +105,7 @@ public class ExportServiceImpl implements ExportService {
+ "fc_member_film mf " + "fc_member_film mf "
+ "where " + "where "
+ "state = 2"; + "state = 2";
List<Map<String, Object>> list = jdbcTemplate.limitAll(sql, new Page(1L, 1000L, new String[] {"film_no asc"})); List<Map<String, Object>> list = jdbcTemplate.limitAll(sql, new Page(1L, 1000L, new String[] {"film_no asc", "id asc"}));
for(Map<String, Object> map : list) { for(Map<String, Object> map : list) {
map.put("film_country_cn", countryMap.get(map.get("film_country"))); map.put("film_country_cn", countryMap.get(map.get("film_country")));
map.put("co_production_country_cn", countryMap.get(map.get("co_production_country"))); map.put("co_production_country_cn", countryMap.get(map.get("co_production_country")));
......
...@@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory; ...@@ -15,6 +15,7 @@ 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.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
...@@ -221,8 +222,7 @@ public class AdminFirstController { ...@@ -221,8 +222,7 @@ public class AdminFirstController {
return Rjx.jsonOk().setData(exportService.getApplyListColumns()); return Rjx.jsonOk().setData(exportService.getApplyListColumns());
} }
@ResponseBody @GetMapping("exportApplyList")
@PostMapping("exportApplyList")
@ApiOperation("导出报名列表") @ApiOperation("导出报名列表")
public void exportApplyList(HttpServletResponse response, String[] columns) throws IOException { public void exportApplyList(HttpServletResponse response, String[] columns) throws IOException {
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
...@@ -237,8 +237,7 @@ public class AdminFirstController { ...@@ -237,8 +237,7 @@ public class AdminFirstController {
return Rjx.jsonOk().setData(exportService.getApplyPassListColumns()); return Rjx.jsonOk().setData(exportService.getApplyPassListColumns());
} }
@ResponseBody @GetMapping("exportApplyPassList")
@PostMapping("exportApplyPassList")
@ApiOperation("导出影片列表") @ApiOperation("导出影片列表")
public void exportApplyPassList(HttpServletResponse response, String[] columns) throws IOException { public void exportApplyPassList(HttpServletResponse response, String[] columns) throws IOException {
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
......
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