x

src/main/java/com/egolm/film/api/service/ReviewService.java

@@ -42,7 +42,9 @@ public interface ReviewService {
 			Integer opt_state, 
 			Page page);
 	
-	List<Map<String, Object>> listNewAsianList(String keyword, Integer review_state, String ext_type, Integer reveiw_round, Page page);
+	List<Map<String, Object>> queryNewAsianRound3List(String keyword, Integer review_state, String ext_type, Page page);
+	
+	List<Map<String, Object>> queryNewAsianRound2List(String keyword, Integer review_state, String ext_type, Page page);
 	
 	/**
 	 * 查询评委审片列表

src/main/java/com/egolm/film/api/service/impl/ReviewServiceImpl.java

@@ -119,8 +119,13 @@ public class ReviewServiceImpl implements ReviewService {
 	}
 	
 	@Override
-	public List<Map<String, Object>> listNewAsianList(String keyword, Integer review_state, String ext_type, Integer review_round, Page page) {
-		XRException.assertNotBlank("评选轮数不能未空", review_round);
+	public List<Map<String, Object>> queryNewAsianRound2List(String keyword, Integer review_state, String ext_type, Page page) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	@Override
+	public List<Map<String, Object>> queryNewAsianRound3List(String keyword, Integer review_state, String ext_type, Page page) {
 		XRException.assertNotBlank("获奖类型不能未空", ext_type);
 		String sql = ""
 				+ "select "
@@ -142,7 +147,7 @@ public class ReviewServiceImpl implements ReviewService {
 					+ "fc_review_history rh left join fc_member_film mf on mf.id = rh.film_id "
 				+ "where "
 					+ "rre.ext_type = '" + ext_type + "' "
-					+ "and rh.review_round = " + review_round + " "
+					+ "and rh.review_round = 3 "
 					+ "and rre.record_id = rr.id "
 					+ "and rr.review_id = rh.review_id "
 					+ "and rh.enroll_type_id = 2 "

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

@@ -93,21 +93,38 @@ public class AdminReviewController {
 	} 
 	
 	@ResponseBody
-	@PostMapping("listNewAsianList")
-	@ApiOperation("查询亚新榜单")
+	@PostMapping("listNewAsian_Round_2_List")
+	@ApiOperation("查询亚新2选榜单")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="string", name="keyword", value="搜索关键字"),
 		@ApiImplicitParam(paramType="query", dataType="int",    name="review_state", value="评委意见(3参赛 4参赛备选 5参展)"),
 		@ApiImplicitParam(paramType="query", dataType="int",    name="ext_type", value="获奖类型(前端根据审片时保存到数据库的对应字段进行检索)"),
-		@ApiImplicitParam(paramType="query", dataType="int",    name="reveiw_round", value="审片环节 2,3"),
 		@ApiImplicitParam(paramType="query", dataType="long",   name="index", value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",   name="limit", value="分页大小"),
 	})
-	public Object listNewAsian(String keyword, Integer review_state, String ext_type, Integer reveiw_round, Long index, Long limit) {
+	public Object listNewAsian_Round_2_List(String keyword, Integer review_state, String ext_type, 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 = reviewService.listNewAsianList(keyword, review_state, ext_type, reveiw_round, page);
+		List<Map<String, Object>> list = reviewService.queryNewAsianRound2List(keyword, review_state, ext_type, page);
+		return Rjx.jsonOk().setData(list).setPage(page);
+	} 
+	
+	@ResponseBody
+	@PostMapping("listNewAsian_Round_3_List")
+	@ApiOperation("查询亚新3选榜单")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="string", name="keyword", value="搜索关键字"),
+		@ApiImplicitParam(paramType="query", dataType="int",    name="review_state", value="评委意见(3参赛 4参赛备选 5参展)"),
+		@ApiImplicitParam(paramType="query", dataType="int",    name="ext_type", value="获奖类型(前端根据审片时保存到数据库的对应字段进行检索)"),
+		@ApiImplicitParam(paramType="query", dataType="long",   name="index", value="分页编号"),
+		@ApiImplicitParam(paramType="query", dataType="long",   name="limit", value="分页大小"),
+	})
+	public Object listNewAsian_Round_3_List(String keyword, Integer review_state, String ext_type, 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 = reviewService.queryNewAsianRound3List(keyword, review_state, ext_type, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}