x

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

@@ -397,20 +397,27 @@ public class ReviewServiceImpl implements ReviewService {
 				} else {
 					throw new XRException("亚新第3轮审片结论错误");
 				}
-			} else if(review_round.intValue() == 4) {
+			} else if(review_round.intValue() == 4) {//把关
+				if(review_state.intValue() == 1) {
+					this.toNextRound(review.getId());
+				} else {
+					throw new XRException("亚新第4轮审片结论错误");
+				}
+			} else if(review_round.intValue() == 5) {//选片委员会
 				if(review_state.intValue() == 3) {//参赛,自动进入下一轮评选
 					this.toNextRound(review.getId());
 				} else if(review_state.intValue() == 5) {//参展,结束当前流程,启动新参展流程
 					this.transfer_4_Flow(review);
 				} else {
-					throw new XRException("亚新第4轮审片结论错误");
+					throw new XRException("亚新第5轮审片结论错误");
 				}
-			} else if(review_round.intValue() == 5) {
+			} else if(review_round.intValue() == 6) {//总局审片
 				if(review_state.intValue() == 1) {
 					jdbcTemplate.executeUpdate("update fc_review set opt_state = 3, review_state = 1 where id = ?", review.getId());
 				} else {
-					throw new XRException("亚新第5轮审片结论错误");
+					throw new XRException("亚新第6轮审片结论错误");
 				}
+				
 			} else {
 				throw new XRException("亚新审片轮数错误[" + review_round + "]");
 			}
@@ -433,19 +440,25 @@ public class ReviewServiceImpl implements ReviewService {
 					} else {
 						throw new XRException("金爵短片3轮审片结论错误");
 					}
-				} else if(review_round.intValue() == 4) {
+				} else if(review_round.intValue() == 4) {//把关
+					if(review_state.intValue() == 1) {
+						this.toNextRound(review.getId());
+					} else {
+						throw new XRException("金爵短片4轮审片结论错误");
+					}
+				} else if(review_round.intValue() == 5) {//选片委员会
 					if(review_state.intValue() == 3) {
 						this.toNextRound(review.getId());
 					} else if(review_state.intValue() == 5) {//参展,结束当前流程,启动新参展流程
 						this.transfer_4_Flow(review);
 					} else {
-						throw new XRException("金爵短片4轮审片结论错误");
+						throw new XRException("金爵短片5轮审片结论错误");
 					}
-				} else if(review_round.intValue() == 5) {
+				} else if(review_round.intValue() == 6) {//总局审片
 					if(review_state.intValue() == 1) {
 						jdbcTemplate.executeUpdate("update fc_review set opt_state = 3, review_state = 1 where id = ?", review.getId());
 					} else {
-						throw new XRException("金爵短片5轮审片结论错误");
+						throw new XRException("金爵短片6轮审片结论错误");
 					}
 				} else {
 					throw new XRException("金爵短片审片轮数错误[" + review_round + "]");
@@ -467,19 +480,25 @@ public class ReviewServiceImpl implements ReviewService {
 					} else {
 						throw new XRException("金爵长片3轮审片结论错误");
 					}
-				} else if(review_round.intValue() == 4) {
+				} else if(review_round.intValue() == 4) {//把关
+					if(review_state.intValue() == 1) {
+						this.toNextRound(review.getId());
+					} else {
+						throw new XRException("金爵长片4轮审片结论错误");
+					}
+				} else if(review_round.intValue() == 5) {//选片委员会
 					if(review_state.intValue() == 3) {
 						this.toNextRound(review.getId());
 					} else if(review_state.intValue() == 5) {//参展,结束当前流程,启动新参展流程
 						this.transfer_4_Flow(review);
 					} else {
-						throw new XRException("金爵长片4轮审片结论错误");
+						throw new XRException("金爵长片5轮审片结论错误");
 					}
-				} else if(review_round.intValue() == 5) {
+				} else if(review_round.intValue() == 6) {//总局审片
 					if(review_state.intValue() == 1) {
 						jdbcTemplate.executeUpdate("update fc_review set opt_state = 3, review_state = 1 where id = ?", review.getId());
 					} else {
-						throw new XRException("金爵长片5轮审片结论错误");
+						throw new XRException("金爵长片6轮审片结论错误");
 					}
 				} else {
 					throw new XRException("金爵长片审片轮数错误[" + review_round + "]");