x

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

@@ -368,6 +368,9 @@ public class ReviewServiceImpl implements ReviewService {
 			jdbcTemplate.executeUpdate("update fc_review set opt_state = 3, review_state = 2 where id = ?", review.getId());
 		} else if(reviewState == -1) {//争议
 			jdbcTemplate.executeUpdate("update fc_review set opt_state = 1, allot_state = 0 where id = ?", review.getId());
+			if(enrollType == 2 && (reviewRound == 2 || reviewRound == 3)) {
+				this.createAsiaNewReport(review.getId().intValue(), reviewRound);
+			}
 		} else {
 			jdbcTemplate.executeUpdate("update fc_review set opt_state = 2, review_state = ? where id = ?", reviewState, review.getId());
 			if(enrollType == 1) {
@@ -408,8 +411,7 @@ public class ReviewServiceImpl implements ReviewService {
 	public void createAsiaNewReport(int review_id, int review_round) {
 		Fc_review review = jdbcTemplate.queryForBean("select * from fc_review where id = ?", Fc_review.class, review_id);
 		int enrollType = review.getEnroll_type_id();
-		int optState = review.getOpt_state();
-		if(enrollType == 2 && ((review_round == 2 && optState == 2 || review_round > 2) || (review_round == 3 && optState == 2 || review_round > 3))) {
+		if(enrollType == 2) {
 			Fc_member_film film = filmService.queryMemberFilmById(review.getFilm_id().longValue());
 			Fc_report_asia_new asiaNew = new Fc_report_asia_new();
 			asiaNew.setReview_id(review_id);
@@ -472,6 +474,7 @@ public class ReviewServiceImpl implements ReviewService {
 						throw new XException("生成亚新榜单中间结果错误", e);
 					}
 				}
+				jdbcTemplate.executeUpdate("delete from fc_report_asia_new where review_id = ?", asiaNew.getReview_id());
 				jdbcTemplate.save(asiaNew);
 			}
 		}
@@ -656,6 +659,7 @@ public class ReviewServiceImpl implements ReviewService {
 
 	@Override
 	public void toType4(Integer review_id) {
+		jdbcTemplate.executeUpdate("delete from fc_report_asia_new where review_id = ?", review_id);
 		jdbcTemplate.executeUpdate("update fc_review set enroll_type_id = 4 where id = ?", review_id);
 	}