x

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

@@ -408,7 +408,7 @@ public class FilmServiceImpl implements FilmService {
 			Integer review_round, 
 			Integer review_state, 
 			Integer allot_atate, 
-			Integer r_state, 
+			Integer opt_state, 
 			Page page) {
 		SqlWhere where1 = new SqlWhere()
 				.eq("mf.state", state)
@@ -482,7 +482,7 @@ public class FilmServiceImpl implements FilmService {
 				.eq("t.review_round", review_round)
 				.eq("t.review_state", review_state)
 				.eq("t.allot_atate", allot_atate)
-				.eq("t.state", r_state)
+				.eq("t.opt_state", opt_state)
 				;
 		
 		sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", where2.getStringList());
@@ -593,7 +593,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 set allot_state = 1, state = 0 where id = ? and review_round = ?", review_id, review_round);
+		jdbcTemplate.executeUpdate("update fc_review set allot_state = 1, opt_state = 0 where id = ? and review_round = ?", review_id, review_round);
 	}
 
 	@Override

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

@@ -39,7 +39,7 @@ public class ReviewServiceImpl implements ReviewService {
 			Integer review_round, 
 			Integer review_state, 
 			Integer allot_state, 
-			Integer state,
+			Integer opt_state,
 			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})
@@ -53,7 +53,7 @@ public class ReviewServiceImpl implements ReviewService {
 				.eq("r.enroll_type_id", enroll_type_id)
 				.eq("r.review_state", review_state)
 				.eq("r.allot_state", allot_state)
-				.eq("r.state", state);
+				.eq("r.opt_state", opt_state);
 		String sql = ""
 				+ "select "
 					+ "mf.id, "
@@ -69,7 +69,7 @@ public class ReviewServiceImpl implements ReviewService {
 					+ "r.review_round, "
 					+ "r.review_state, "
 					+ "r.allot_state, "
-					+ "r.state, "
+					+ "r.opt_state, "
 					+ "r.enroll_type_id, "
 					+ "(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 "
@@ -91,7 +91,8 @@ public class ReviewServiceImpl implements ReviewService {
 					+ "r.id, "
 					+ "r.review_round, "
 					+ "r.review_state, "
-					+ "r.allot_state,"
+					+ "r.allot_state, "
+					+ "r.opt_state, "
 					+ "r.enroll_type_id "
 				;
 		
@@ -132,6 +133,7 @@ public class ReviewServiceImpl implements ReviewService {
 					+ "r.review_round, "
 					+ "r.allot_state, "
 					+ "r.review_state, "
+					+ "r.opt_state, "
 					+ "r.push_time, "
 					+ "rr.view_state, "
 					+ "rr.review_state user_review_state, "
@@ -218,7 +220,7 @@ public class ReviewServiceImpl implements ReviewService {
 			review.setReview_round(1);
 			review.setPush_time(now);
 			review.setAllot_state(0);
-			review.setState(0);
+			review.setOpt_state(0);
 			review.setReview_state(null);
 			review.setCreate_time(now);
 			jdbcTemplate.save(review);
@@ -231,7 +233,7 @@ public class ReviewServiceImpl implements ReviewService {
 	public void toNextRound(Integer review_id) {
 		Integer count = jdbcTemplate.queryForInt("select count(rr.id) from fc_review_record rr, fc_review r where rr.review_id = r.id and rr.review_round = r.review_round and r.id = ?", review_id);
 		Integer allot_state = count > 0 ? 1 : 0;
-		jdbcTemplate.executeUpdate("update fc_review set review_round = review_round + 1, state = 0, allot_state = ?, review_state = null, push_time = now() where id = ?", allot_state, review_id);
+		jdbcTemplate.executeUpdate("update fc_review set review_round = review_round + 1, opt_state = 0, allot_state = ?, review_state = null, push_time = now() where id = ?", allot_state, review_id);
 	}
 	
 	private Integer reviewStateElection(List<Fc_review_record> records) {
@@ -279,14 +281,14 @@ public class ReviewServiceImpl implements ReviewService {
 			return;
 		} else if(review_state == -1) {
 			//审片结果有争议,等待增加新评委或管理员决定本轮最终结果
-			jdbcTemplate.executeUpdate("update fc_review set state = 1 where id = ?", review.getId());
+			jdbcTemplate.executeUpdate("update fc_review set opt_state = 1 where id = ?", review.getId());
 		} else if((enroll_type_id.intValue() == 2 || enroll_type_id.intValue() == 4) && (review_round == 2 || review_round == 3)) {
 			//理员决定是否晋级下一轮评选
-			jdbcTemplate.executeUpdate("update fc_review set state = 2 where id = ?", review.getId());
+			jdbcTemplate.executeUpdate("update fc_review set opt_state = 2 where id = ?", review.getId());
 		} else {
 			if(review_round == 6) {
 				//已经是最后一轮评选
-				jdbcTemplate.executeUpdate("update fc_review set state = 3 where id = ?", review.getId());
+				jdbcTemplate.executeUpdate("update fc_review set opt_state = 3 where id = ?", review.getId());
 			} else {
 				//自动进入下一轮评选
 				this.toNextRound(review.getId());

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

@@ -273,7 +273,7 @@ public class Fc_member_film implements java.io.Serializable {
 	private String lang;
 
 	/**
-	 * 状态
+	 * 申报状态 1未提交 2初审通过 3初审否决
 	 */
 	private Integer apply_state;
 
@@ -439,7 +439,7 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param film_format_other 样片url其他
 	 * @param film_type_name_short 短片类型
 	 * @param lang 语言
-	 * @param apply_state 状态
+	 * @param apply_state 申报状态 1未提交 2初审通过 3初审否决
 	 * @param apply_state_intro 初审处理意见
 	 * @param film_district 区域
 	 * @param is_check_director 状态

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

@@ -33,23 +33,19 @@ public class Fc_review implements java.io.Serializable {
 	private Integer review_round;
 
 	/**
-	 * 评委分配状态 0未分配评委,1已分配评委评选中
+	 * 评委分配状态 0未分配评委 1已分配评委评选中
 	 */
 	private Integer allot_state;
 
 	/**
-	 * 审片结论 1通过,2否决,3参赛,4参赛备选,5参展
+	 * 审片结论 1通过 2否决 3参赛 4参赛备选 5参展
 	 */
 	private Integer review_state;
 
 	/**
-	 * 评选状态
-0未评选
-1有争议
-2管理员分配
-3已完成
+	 * 评选状态 0未评选 1有争议 2管理员分配 3审片完成 4终审归档
 	 */
-	private Integer state;
+	private Integer opt_state;
 
 	/**
 	 * 推送时间
@@ -72,24 +68,20 @@ public class Fc_review implements java.io.Serializable {
 	 * @param film_id 参审影片ID
 	 * @param enroll_type_id 影片性质(申报奖项)ID
 	 * @param review_round 审片轮数,第几轮审片
-	 * @param allot_state 评委分配状态 0未分配评委,1已分配评委评选中
-	 * @param review_state 审片结论 1通过,2否决,3参赛,4参赛备选,5参展
-	 * @param state 评选状态
-0未评选
-1有争议
-2管理员分配
-3已完成
+	 * @param allot_state 评委分配状态 0未分配评委 1已分配评委评选中
+	 * @param review_state 审片结论 1通过 2否决 3参赛 4参赛备选 5参展
+	 * @param opt_state 评选状态 0未评选 1有争议 2管理员分配 3审片完成 4终审归档
 	 * @param push_time 推送时间
 	 * @param create_time 
 	 */
-	public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer allot_state, Integer review_state, Integer 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 opt_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.state = state;
+		this.opt_state = opt_state;
 		this.push_time = push_time;
 		this.create_time = create_time;
 	}
@@ -142,12 +134,12 @@ public class Fc_review implements java.io.Serializable {
 		return review_state;
 	}
 
-	public void setState(Integer state) {
-		this.state = state;
+	public void setOpt_state(Integer opt_state) {
+		this.opt_state = opt_state;
 	}
 
-	public Integer getState() {
-		return state;
+	public Integer getOpt_state() {
+		return opt_state;
 	}
 
 	public void setPush_time(Date push_time) {