x

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

@@ -566,7 +566,7 @@ public class FilmServiceImpl implements FilmService {
 			objs[i] = new Object[]{review_id, user_id[i], review_round, review_id, user_id[i], review_round};
 		}
 		jdbcTemplate.batchUpdate(sql, objs);
-		jdbcTemplate.executeUpdate("update fc_review_record set review_state = 1 where review_id = ? and review_round = ?", review_id, review_round);
+		jdbcTemplate.executeUpdate("update fc_review_record set allot_state = 1 where review_id = ? and review_round = ?", review_id, review_round);
 	}
 
 	@Override

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

@@ -29,8 +29,9 @@ public class VoteServiceImpl implements VoteService {
 		review.setEnroll_type_id(enroll_type_id);
 		review.setFilm_id(member_film_id.intValue());
 		review.setReview_round(1);
-		review.setReview_state(0);
 		review.setPush_time(now);
+		review.setAllot_state(0);
+		review.setDispute_state(0);
 		review.setCreate_time(now);
 		jdbcTemplate.save(review);
 	}

src/main/java/com/egolm/film/bean/Fc_review.java

@@ -33,10 +33,20 @@ public class Fc_review implements java.io.Serializable {
 	private Integer review_round;
 
 	/**
-	 * 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
+	 * 评委分配状态 0未分配评委,1已分配评委评选中
+	 */
+	private Integer allot_state;
+
+	/**
+	 * 审片状态 1通过,2否决,3参赛,4参赛备选,5参展
 	 */
 	private Integer review_state;
 
+	/**
+	 * 争议状态 0无争议 1有争议
+	 */
+	private Integer dispute_state;
+
 	/**
 	 * 推送时间
 	 */
@@ -58,16 +68,20 @@ public class Fc_review implements java.io.Serializable {
 	 * @param film_id 参审影片ID
 	 * @param enroll_type_id 影片性质(申报奖项)ID
 	 * @param review_round 审片轮数,第几轮审片
-	 * @param review_state 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
+	 * @param allot_state 评委分配状态 0未分配评委,1已分配评委评选中
+	 * @param review_state 审片状态 1通过,2否决,3参赛,4参赛备选,5参展
+	 * @param dispute_state 争议状态 0无争议 1有争议
 	 * @param push_time 推送时间
 	 * @param create_time 
 	 */
-	public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer review_state, Date push_time, Date create_time) {
+	public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer allot_state, Integer review_state, Integer dispute_state, Date push_time, Date create_time) {
 		this.id = id;
 		this.film_id = film_id;
 		this.enroll_type_id = enroll_type_id;
 		this.review_round = review_round;
+		this.allot_state = allot_state;
 		this.review_state = review_state;
+		this.dispute_state = dispute_state;
 		this.push_time = push_time;
 		this.create_time = create_time;
 	}
@@ -104,6 +118,14 @@ public class Fc_review implements java.io.Serializable {
 		return review_round;
 	}
 
+	public void setAllot_state(Integer allot_state) {
+		this.allot_state = allot_state;
+	}
+
+	public Integer getAllot_state() {
+		return allot_state;
+	}
+
 	public void setReview_state(Integer review_state) {
 		this.review_state = review_state;
 	}
@@ -112,6 +134,14 @@ public class Fc_review implements java.io.Serializable {
 		return review_state;
 	}
 
+	public void setDispute_state(Integer dispute_state) {
+		this.dispute_state = dispute_state;
+	}
+
+	public Integer getDispute_state() {
+		return dispute_state;
+	}
+
 	public void setPush_time(Date push_time) {
 		this.push_time = push_time;
 	}

src/main/java/com/egolm/film/bean/Fc_review_record.java

@@ -41,7 +41,7 @@ public class Fc_review_record implements java.io.Serializable {
 	private Integer review_round;
 
 	/**
-	 * 2通过,3否决,4参赛,5参赛备选,6参展
+	 * 审片状态 1通过,2否决,3参赛,4参赛备选,5参展
 	 */
 	private Integer review_state;
 
@@ -80,7 +80,7 @@ public class Fc_review_record implements java.io.Serializable {
 	 * @param user_id 评委ID
 	 * @param view_state 0未观看,1已观看
 	 * @param review_round 评选轮数
-	 * @param review_state 2通过,3否决,4参赛,5参赛备选,6参展
+	 * @param review_state 审片状态 1通过,2否决,3参赛,4参赛备选,5参展
 	 * @param review_score 得分分数
 	 * @param review_text 影片评论
 	 * @param review_text_1