x

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

@@ -25,7 +25,7 @@ public interface ReviewService {
 	 * @param review_round 第几轮审片
 	 * @param review_state 审片结论 1通过 2否决 3参赛 4参赛备选 5参展
 	 * @param allot_state 评委分配状态 0未分配评委 1已分配评委评选中
-	 * @param state 评选状态 0未评选 1有争议 2管理员分配 3已完成
+	 * @param opt_state 评选状态 0未评选 1有争议 2管理员分配 3已完成
 	 * @param page
 	 * @return
 	 */
@@ -39,7 +39,7 @@ public interface ReviewService {
 			Integer review_round, 
 			Integer review_state, 
 			Integer allot_state, 
-			Integer state, 
+			Integer opt_state, 
 			Page page);
 	
 	/**

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

@@ -47,16 +47,16 @@ public class AdminReviewController {
 		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_round",         value="审片当前第几轮[1,2,3,4,5,6]"),
 		@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_state",          value="分配状态 0未分配评委,1已分配评委评"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="state",                value="评选状态 0未评选 1有争议 2管理员分配 3已完成"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="opt_state",            value="评选状态 0未评选 1有争议 2管理员分配 3已完成"),
 		@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 enroll_type_id, Integer film_type_name, Integer film_type_name_short, String film_country, Integer review_round, Integer review_state, Integer allot_state, Integer state, Long index, Long limit) {
+	public Object list(String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short, String film_country, Integer review_round, Integer review_state, Integer allot_state, Integer opt_state, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
 		Fc_admin admin = (Fc_admin)tokenService.getTokenObj();
-		List<Map<String, Object>> list = reviewService.queryReviewListForAdmin(keyword, admin.getGroup_id(), enroll_type_id, film_type_name, film_type_name_short, film_country, review_round, review_state, allot_state, state, page);
+		List<Map<String, Object>> list = reviewService.queryReviewListForAdmin(keyword, admin.getGroup_id(), enroll_type_id, film_type_name, film_type_name_short, film_country, review_round, review_state, allot_state, opt_state, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}