x

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

@@ -111,7 +111,7 @@ public interface FilmService {
 			Integer review_round, 
 			Integer review_state, 
 			Integer allot_atate, 
-			Integer r_state, 
+			Integer opt_state, 
 			Page page);
 
 	Integer pass(Long member_film_id);

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

@@ -442,7 +442,7 @@ public class FilmServiceImpl implements FilmService {
 					+ "r.enroll_type_id, "
 					+ "r.review_state, "
 					+ "r.allot_state, "
-					+ "r.state r_state, "
+					+ "r.opt_state, "
 					+ "group_concat(fp.playactor_name) director_name "
 				+ "from "
 					+ "fc_member_film mf left join fc_review r on r.film_id = mf.id, fc_member_film_playactor fp "

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

@@ -72,7 +72,7 @@ public class AdminFirstController {
 		@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="r_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="分页大小"),
 	})
@@ -89,7 +89,7 @@ public class AdminFirstController {
 			Integer review_round, 
 			Integer review_state, 
 			Integer allot_atate, 
-			Integer r_state, 
+			Integer opt_state, 
 			Long index, 
 			Long limit) {
 		index = index == null ? 1 : index;
@@ -108,7 +108,7 @@ public class AdminFirstController {
 				review_round, 
 				review_state, 
 				allot_atate, 
-				r_state, page);
+				opt_state, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}