c

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

@@ -87,25 +87,16 @@ public class VoteServiceImpl implements VoteService {
 		Integer review_round = review.getReview_round();
 		Integer review_state = this.reviewStateElection(records);
 		if(review_state != null) {
-			if(review_round == 1) {
+			if(enroll_type_id.intValue() == 2 && (review_round == 2 || review_round == 3)) {
+				
+			} else if(enroll_type_id.intValue() == 4 && (review_round == 2 || review_round == 3)) {
+				
+			} else {
 				this.toNextRound(review.getId());//第一轮审片完成,进入下一轮
 			}
 		} else {
 			//TODO 审片结论有争议,打标记      后续增加评委后再审
 		}
-		
-		if(enroll_type_id.intValue() == 1) {//金爵奖国际影片评选
-			if(review_round.intValue() == 1) {
-				
-			}
-		} else if(enroll_type_id.intValue() == 2) {//亚洲新人奖国际影片评选
-			
-		} else if(enroll_type_id.intValue() == 3) {//电影频道传媒关注
-			
-		} else if(enroll_type_id.intValue() == 4) {//国际电影展映
-			
-		}
-		
 	}
 	
 }