x

src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java

@@ -66,7 +66,6 @@ public class AdminFirstController {
 	
 	@ResponseBody
 	@PostMapping("list")
-	@GetMapping("exportExcel")
 	@ApiOperation("影片列表")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",         value="关键字"),
@@ -82,68 +81,52 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_state",    value="审片结论 1通过 2否决 3参赛 4参赛备选 5参展"),
 		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="allot_atate",     value="评委分配状态 0未分配评委 1已分配评委评选中"),
 		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="opt_state",         value="评选状态 0未评选 1有争议 2管理员分配 3已完成"),
-		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="columns",         value="数据导出时导出列" , allowMultiple=true),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",           value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",           value="分页大小"),
 	})
 	public Object list(
-			String keyword, 
-			Integer state, 
-			Integer apply_state,
-			Integer film_type, 
-			Integer enroll_type, 
-			Integer upload_state, 
-			String film_country, 
-			Integer film_type_short, 
-			String play_shanghai, 
-			Integer review_round, 
-			Integer review_state, 
-			Integer allot_atate, 
-			Integer opt_state, 
+			String keyword, String film_country, String play_shanghai, 
+			Integer state, Integer apply_state, Integer film_type, Integer enroll_type, Integer upload_state, Integer film_type_short, 
+			Integer review_round, Integer review_state, Integer allot_atate, Integer opt_state, 
 			Long index, 
 			Long limit, 
-			String[] columns,
 			HttpServletRequest request,
 			HttpServletResponse response) throws IOException {
-		if(request.getMethod().equalsIgnoreCase("POST")) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-			List<Map<String, Object>> list = memberFilmService.queryChuShenList(
-					keyword, 
-					state, 
-					apply_state, 
-					upload_state,
-					film_type, 
-					enroll_type, 
-					film_country, 
-					film_type_short, 
-					play_shanghai, 
-					review_round, 
-					review_state, 
-					allot_atate, 
-					opt_state, 
-					page);
+		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, state, apply_state, upload_state, film_type, enroll_type, film_country, film_type_short, play_shanghai, review_round, review_state, allot_atate, opt_state, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
-		} else {
+	}
+	
+	@GetMapping("exportExcel")
+	@ApiOperation("影片列表")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",         value="关键字"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="state",           value="影片状态 1未提交 2 已提交"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="apply_state",     value="初审状态 1未初审 2初审通过 3初审否决"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type",       value="影片类型"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="enroll_type",     value="影片性质"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="film_country",    value="影片国家地区"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type_short", value="影片扩展分类"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="upload_state",    value="影片文件上传状态(0,1)"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="play_shanghai",   value="首映情况"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_round",    value="审片轮数,第几轮审片"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_state",    value="审片结论 1通过 2否决 3参赛 4参赛备选 5参展"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="allot_atate",     value="评委分配状态 0未分配评委 1已分配评委评选中"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="opt_state",         value="评选状态 0未评选 1有争议 2管理员分配 3已完成"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="columns",         value="数据导出时导出列" , allowMultiple=true),
+	})
+	public void exportExcel(
+			String keyword, String film_country, String play_shanghai, 
+			Integer state, Integer apply_state, Integer film_type, Integer enroll_type, Integer upload_state, Integer film_type_short, 
+			Integer review_round, Integer review_state, Integer allot_atate, Integer opt_state, 
+			String[] columns,
+			HttpServletRequest request,
+			HttpServletResponse response) throws IOException {
 		response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("影片列表[" + DateUtil.format(new Date(), "yyMMdd-HHmmss") + "].xls", "UTF-8"));
-			exportService.export(response.getOutputStream(), keyword, 
-					state, 
-					apply_state,
-					film_type, 
-					enroll_type, 
-					upload_state, 
-					film_country, 
-					film_type_short, 
-					play_shanghai, 
-					review_round, 
-					review_state, 
-					allot_atate, 
-					opt_state,
-					columns);
-			return null;
-		}
+		exportService.export(response.getOutputStream(), keyword, state, apply_state, film_type, enroll_type, upload_state, film_country, film_type_short, play_shanghai, review_round, review_state, allot_atate, opt_state, columns);
 	}
 	
 	@Transactional