x

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

@@ -58,31 +58,11 @@ public class AdminFirstController {
 	
 	@ResponseBody
 	@PostMapping("list")
-	@ApiOperation("初审列表分页查询")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",     value="关键字"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="state",       value="影片状态[state=1 未提交, state=2 已提交]"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="apply_state", value="初审状态[apply_state=1 未初审, apply_state=2 初审通过, apply_state=3 初审未通过]"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type",   value="影片类型"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type_short"),
-		@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="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, String film_country, Integer film_type_short, Long index, Long limit) {
-		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, null, film_type, enroll_type, film_country, film_type_short, null, null, null, null, null, page);
-		return Rjx.jsonOk().setData(list).setPage(page);
-	}
-	
-	@ResponseBody
-	@PostMapping("pass_list")
 	@ApiOperation("初审通过列表")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",         value="关键字"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="state",           value="影片状态[state=1 未提交, state=2 已提交]"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="apply_state",     value="初审状态[apply_state=1 未初审, apply_state=2 初审通过, apply_state=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="影片国家地区"),
@@ -98,26 +78,35 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",       value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
 	})
-	public Object pass_list(
+	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 r_state, 
-			
 			Long index, 
 			Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, 2, 2, upload_state,film_type, enroll_type, film_country, film_type_short, play_shanghai, 
+		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,