x

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

@@ -309,12 +309,12 @@ public class ReviewServiceImpl implements ReviewService {
 		jdbcTemplate.executeUpdate("update fc_review set review_round = ?, opt_state = 0, allot_state = ?, review_state = null, push_time = now() where id = ?", review_round, allot_state, review_id);
 	}
 	
-	private Integer toReviewState(List<Fc_review_record> records) {
+	private int toReviewState(List<Fc_review_record> records) {
 		Map<Integer, Integer> map = new HashMap<Integer, Integer>();
 		for(Fc_review_record record : records) {
 			Integer review_state = record.getReview_state();; 
 			if(review_state == null) {
-				return null;
+				return 0;
 			}
 			map.put(review_state, map.get(review_state) == null ? 1 : (map.get(review_state) + 1));
 		}
@@ -339,7 +339,7 @@ public class ReviewServiceImpl implements ReviewService {
 				return -1;
 			}
 		}
-		return null;
+		return 0;
 	}
 	
 	private void closeFlow(int reviewState, int reviewId) {
@@ -353,11 +353,8 @@ public class ReviewServiceImpl implements ReviewService {
 		List<Fc_review_record> records = jdbcTemplate.queryForBeans("select * from fc_review_record where review_id = ? and review_round = ?", Fc_review_record.class, review.getId(), review.getReview_round());
 		int reviewRound = review.getReview_round().intValue();
 		int enrollType = review.getEnroll_type_id().intValue();
-		int reviewState = 0;
-		try {
-			reviewState = this.toReviewState(records).intValue();
-		} catch (NullPointerException e) {
-			//未完成
+		int reviewState = this.toReviewState(records);
+		if(reviewState == 0) {
 			return;
 		}
 		if(reviewState == 2) {//否决