Merge branch 'master' of http://gitlab.egolm.com/hanxu/siff-film-api.git

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

@@ -53,7 +53,6 @@ public class ReviewServiceImpl implements ReviewService {
 			Page page) {
 		SqlWhere w1 = new SqlWhere()
 				.where("mf.film_type_name in (select agft.film_type_id from fc_admin_group_filmtype agft where agft.group_id = ?)", new Object[]{group_id})
-				.eq("mf.upload_state", 1)
 				.eq("mf.film_type_name", film_type_name)
 				.eq("mf.film_type_name_short", film_type_name_short)
 				.eq("mf.film_country", film_country)
@@ -89,7 +88,8 @@ public class ReviewServiceImpl implements ReviewService {
 					+ "r.allot_state, "
 					+ "r.opt_state, "
 					+ "(select group_concat(fp.playactor_name) from fc_member_film_playactor fp where fp.film_id = mf.id and fp.playactor_type = 'director' group by fp.film_id, fp.playactor_type) director_name, "
-					+ "count(rr.id) user_count "
+					+ "count(rr.id) user_count, "
+					+ "count(case when rr.review_state is not null then rr.id end) user_review_count "
 				+ "from "
 					+ sql_film + " mf, "
 					+ "fc_review r left join fc_review_record rr on rr.review_id = r.id and rr.review_round = r.review_round "
@@ -309,39 +309,41 @@ 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) {
-		if(records != null && records.size() > 1) {
-			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;
-				}
-				map.put(review_state, map.get(review_state) == null ? 1 : (map.get(review_state) + 1));
-			}
-			Collection<Integer> ary = map.values();
-			Integer maxCount = 0;
-			for(Integer count : ary) {
-				maxCount = count > maxCount ? count : maxCount;
+	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 0;
 			}
-			if(maxCount > 0) {
-				Integer i = 0;
-				Integer review_state = null;
-				for(Integer key : map.keySet()) {
-					Integer value = map.get(key);
-					if(value.intValue() == maxCount.intValue()) {
-						review_state = key;
-						i++;
-					}
-				}
-				if(i.intValue() == 1) {
-					return review_state;
-				} else {
-					return -1;
+			map.put(review_state, map.get(review_state) == null ? 1 : (map.get(review_state) + 1));
+		}
+		Collection<Integer> ary = map.values();
+		Integer maxCount = 0;
+		for(Integer count : ary) {
+			maxCount = count > maxCount ? count : maxCount;
+		}
+		if(maxCount > 0) {
+			Integer i = 0;
+			Integer review_state = null;
+			for(Integer key : map.keySet()) {
+				Integer value = map.get(key);
+				if(value.intValue() == maxCount.intValue()) {
+					review_state = key;
+					i++;
 				}
 			}
+			if(i.intValue() == 1) {
+				return review_state;
+			} else {
+				return -1;
+			}
 		}
-		return null;
+		return 0;
+	}
+	
+	private void closeFlow(int reviewState, int reviewId) {
+		jdbcTemplate.executeUpdate("update fc_review set opt_state = 3, review_state = ? where id = ?", reviewState, reviewId);
 	}
 	
 	@Override
@@ -349,29 +351,54 @@ public class ReviewServiceImpl implements ReviewService {
 	public void tryNextRound(Integer review_id) {
 		Fc_review review = jdbcTemplate.queryForBean("select * from fc_review where id = ?", Fc_review.class, review_id);
 		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());
-		Integer review_round = review.getReview_round();
-		Integer enroll_type_id = review.getEnroll_type_id();
-		Integer review_state = this.toReviewState(records);
-		if(review_state == null) {//未完
+		int reviewRound = review.getReview_round().intValue();
+		int enrollType = review.getEnroll_type_id().intValue();
+		int reviewState = this.toReviewState(records);
+		if(reviewState == 0) {
 			return;
 		}
-		if(review_state.intValue() == 2) {//否决
+		if(reviewState == 2) {//否决
 			jdbcTemplate.executeUpdate("update fc_review set opt_state = 3, review_state = 2 where id = ?", review.getId());
-		} else if(review_state.intValue() == -1) {//争议
+		} else if(reviewState == -1) {//争议
 			jdbcTemplate.executeUpdate("update fc_review set opt_state = 1, allot_state = 0 where id = ?", review.getId());
 		} else {
-			jdbcTemplate.executeUpdate("update fc_review set opt_state = 2, review_state = ? where id = ?", review_state, review.getId());
-			if(enroll_type_id.intValue() == 2 && (review_round.intValue() == 2 || review_round.intValue() == 3)) {
+			jdbcTemplate.executeUpdate("update fc_review set opt_state = 2, review_state = ? where id = ?", reviewState, review.getId());
+			if(enrollType == 1) {
+				if(reviewRound == 6 && reviewState == 1) {
+					this.closeFlow(reviewState, review.getId());
+				} else if(reviewRound == 5 && reviewState == 5) {
+					this.toType4(review.getId());
+					this.closeFlow(1, review.getId());
+				} else if((reviewRound == 2 || reviewRound == 3) && reviewState == 5) {
+					this.toType4(review.getId());
+					this.toRound(review.getId(), 4);
+				}
+			} else if(enrollType == 2) {
+				if(reviewRound == 6 && reviewState == 1) {
+					this.closeFlow(reviewState, review.getId());
+				} else if(reviewRound == 5 && reviewState == 5) {
+					this.toType4(review.getId());
+					this.closeFlow(1, review.getId());
+				} else if(reviewRound == 2 && reviewState == 5) {
+					this.toType4(review.getId());
+					this.toRound(review.getId(), 4);
+				}
+			} else if(enrollType == 4) {
+				if((reviewRound == 4 || reviewRound == 5) && reviewState == 1) {
+					this.closeFlow(1, review.getId());
+				}
+			}
+			if(enrollType == 2 && (reviewRound == 2 || reviewRound == 3)) {
 				this.createAsiaNewReport(review.getId());
 			}
 		}
 		Integer opt_state = jdbcTemplate.queryForInt("select opt_state from fc_review where id = ?", review.getId());
 		Fc_review_history history = new Fc_review_history();
 		history.setReview_id(review.getId());
-		history.setEnroll_type_id(enroll_type_id);
+		history.setEnroll_type_id(enrollType);
 		history.setFilm_id(review.getFilm_id());
-		history.setReview_round(review_round);
-		history.setReview_state(review_state);
+		history.setReview_round(reviewRound);
+		history.setReview_state(reviewState);
 		history.setCreate_time(new Date());
 		history.setOpt_state(opt_state);
 		jdbcTemplate.save(history);
@@ -379,6 +406,24 @@ public class ReviewServiceImpl implements ReviewService {
 	
 	public void createAsiaNewReport(Integer review_id) {
 		Fc_review review = jdbcTemplate.queryForBean("select * from fc_review where id = ?", Fc_review.class, review_id);
+		int round = review.getReview_round();
+		int enrollType = review.getEnroll_type_id();
+		if(enrollType == 2 && (round == 2 || round == 3)) {
+			
+		}
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		//TODO 计算单个亚新影片得分
+		
+		
+		
+		
 		
 	}
 	
@@ -390,7 +435,7 @@ public class ReviewServiceImpl implements ReviewService {
 	@Transactional
 	public void saveReviewRecordIfNotExists(Integer review_id, Integer review_round, Integer[] user_id) {
 		Integer count = jdbcTemplate.queryForInt("select count(*) from fc_review_record where review_id = ? and review_round = ?", review_id, review_round);
-		if(count + user_id.length < 2) {
+		if(count + user_id.length < 2 && review_round.intValue() != 5 && review_round.intValue() != 6) {
 			throw new XRException("请至少分配两个审片评委");
 		}
 		String sql = ""

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

@@ -257,36 +257,43 @@ public class AdminReviewController {
 		} else {
 			throw new XRException("参数不平衡");
 		}
+		Integer toRoundNumber = review_round;
 		if(saveList.size() > 0) {
-			reviewService.saveReviewRecordIfNotExists(review_id, review_round, saveList.toArray(new Integer[saveList.size()]));
+			reviewService.saveReviewRecordIfNotExists(review_id, toRoundNumber, saveList.toArray(new Integer[saveList.size()]));
 			Fc_admin admin = Util.mapTo(tokenService.getTokenObj(), Fc_admin.class);
-			newsService.sendAllotNews(review_id, review_round, user_id, admin);
+			newsService.sendAllotNews(review_id, toRoundNumber, user_id, admin);
 		}
 		if(cancelList.size() > 0) {
-			reviewService.deleteReviewRecord(review_id, review_round, cancelList.toArray(new Integer[cancelList.size()]));
+			reviewService.deleteReviewRecord(review_id, toRoundNumber, cancelList.toArray(new Integer[cancelList.size()]));
 		}
 		Fc_review review = reviewService.queryReviewById(review_id);
-		if(review_round.intValue() == 5 
-				|| (review_round.intValue() > review.getReview_round().intValue() && review.getOpt_state().intValue() == 2)) {
-			if(review.getOpt_state() != 2) {
-				throw new XRException("当前审片结论不能分配下一环节评委");
-			}
-			if(review.getEnroll_type_id().intValue() == 2) {
-				if((review.getReview_round().intValue() <= 1 && review_round.intValue() >= 3) 
-						|| (review.getReview_round().intValue() <= 2 && review_round.intValue() >= 4)) {
-					throw new XRException("亚新二选和三选评分不能跳过");
-				} 
-			}
-			if(review.getReview_state().intValue() == 5 && review.getEnroll_type_id().intValue() != 4) {
-				reviewService.toType4(review.getId());
+		int reviewRound = review.getReview_round();
+		int enrollType = review.getEnroll_type_id();
+		int optState = review.getOpt_state();
+		if(toRoundNumber > reviewRound) {
+			if(optState == 2) {
+				if(enrollType == 2 && ((reviewRound <= 1 && reviewRound >= 3) || (reviewRound <= 2 && reviewRound >= 4))) {
+					throw new XRException("亚新二选和三选评分步骤不能跳过");
+				}
+				if((enrollType == 2 || enrollType == 3) && toRoundNumber == 5) {
+					throw new XRException("亚新金爵影片没有把关流程");
+				}
+				if(enrollType == 4 && (toRoundNumber == 3 || toRoundNumber == 6)) {
+					throw new XRException("展映影片没有三选和总局审片流程");
+				}
+				reviewService.toRound(review_id, toRoundNumber);
+			} else {
+				throw new XRException("当前审片状态为" + rounds[reviewRound] + opts[optState] + ",不能分配" + rounds[toRoundNumber] + "评委");
 			}
-			reviewService.toRound(review_id, review_round);
-		} else {
-			throw new XRException("审片流程不能后退");
+		} else if(toRoundNumber < reviewRound) {
+			throw new XRException("已审核环节不能再分配评委");
 		}
 		return Rjx.jsonOk();
 	}
 	
+	static String[] rounds = new String[] {"", "一选", "二选", "三选", "影片把关", "选片委员会", "总局审片"};
+	static String[] opts = new String[] {"未审片", "有争议", "待分配", "已完成"};
+	
 	@ResponseBody
 	@Transactional
 	@PostMapping("allot_show_user")