x

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

@@ -272,8 +272,9 @@ public class AdminReviewController {
 		int reviewRound = review.getReview_round();
 		int enrollType = review.getEnroll_type_id();
 		int optState = review.getOpt_state();
+		int reviewState = review.getReview_state();
 		if(toRoundNumber > reviewRound) {
-			if(optState == 2) {
+			if(optState == 2 || (optState == 1 && reviewRound == 4 && toRoundNumber == 5)) {
 				if(enrollType == 2 && ((reviewRound <= 1 && reviewRound >= 3) || (reviewRound <= 2 && reviewRound >= 4))) {
 					throw new XRException("亚新二选和三选评分步骤不能跳过");
 				}
@@ -283,6 +284,12 @@ public class AdminReviewController {
 				if(enrollType == 4 && (toRoundNumber == 3 || toRoundNumber == 6)) {
 					throw new XRException("展映影片没有三选和总局审片流程");
 				}
+				boolean isJinJue23Round = enrollType == 1 && (reviewRound == 2 || reviewRound == 3);
+				boolean isAsia2Round = enrollType == 2 && reviewRound == 2;
+				if(reviewState == 5 && (isJinJue23Round || isAsia2Round)) {//金爵二选三选或亚新二选转参赛影片把关流程
+					reviewService.toType4(review.getId());
+					reviewService.toRound(review.getId(), 4);
+				}
 				reviewService.toRound(review_id, toRoundNumber);
 			} else {
 				throw new XRException("当前审片状态为" + rounds[reviewRound] + opts[optState] + ",不能分配" + rounds[toRoundNumber] + "评委");