x

src/main/java/com/egolm/film/api/service/FilmService.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.egolm.common.jdbc.Page;
 import com.egolm.film.bean.Fc_member_film;
+import com.egolm.film.bean.Fc_member_film_enroll;
 import com.egolm.film.bean.Fc_member_film_issuer;
 import com.egolm.film.bean.Fc_member_film_playactor;
 import com.egolm.film.bean.Fc_member_film_show;
@@ -118,7 +119,7 @@ public interface FilmService {
 	 * 进入下一个审片环节
 	 * @param member_film_id
 	 */
-	void toNextRound(Long member_film_id);
+	void toNextRound(Long member_film_id, Integer enroll_type_id);
 
 	/**
 	 * 检索审片列表
@@ -134,10 +135,12 @@ public interface FilmService {
 	List<Map<String, Object>> queryReviewList(String keyword, Integer group_id, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short,
 			String film_country, Integer[] review_round, Integer[] review_state, Page page);
 
-	void allot(Long member_film_id, Integer review_round, Integer[] user_id);
+	void allot(Long member_film_id, Integer enroll_type_id, Integer review_round, Integer[] user_id);
 
 	void saveUploadId(Long member_film_id, String upload_id);
 
 	void saveUploadState(Long member_film_id, Integer upload_state);
 
+	List<Fc_member_film_enroll> queryFilmEnrollList(Long member_film_id);
+	
 }

src/main/java/com/egolm/film/api/service/UserReviewService.java

@@ -8,6 +8,6 @@ import com.egolm.common.jdbc.Page;
 
 public interface UserReviewService {
 
-	List<Map<String, Object>> queryReviewList(Date push_date, Integer film_type_id, Integer enroll_type_id,	String keyword, Page page);
+	List<Map<String, Object>> queryReviewList(Integer[] review_state, Date push_date, Integer film_type_id, Integer enroll_type_id,	String keyword, Page page);
 	
 }
\ No newline at end of file

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

@@ -456,19 +456,20 @@ public class FilmServiceImpl implements FilmService {
 	
 	@Override
 	@Transactional
-	public void toNextRound(Long member_film_id) {
-		Fc_member_film film = this.jdbcTemplate.queryForBean("select * from fc_member_film where id = ?", Fc_member_film.class, member_film_id);
-		Integer round = film.getReview_round();
+	public void toNextRound(Long member_film_id, Integer enroll_type_id) {
+		Fc_member_film_enroll enroll = this.jdbcTemplate.queryForBean("select * from fc_member_film_enroll where film_id = ? and enroll_type_id = ?", Fc_member_film_enroll.class, member_film_id, enroll_type_id);
+		Integer round = enroll.getReview_round();
 		Integer nextRound = null;
 		if(round == null || round == 0) {
 			nextRound = 1;
 		} else {
 			nextRound = round + 1;
 		}
-		jdbcTemplate.executeUpdate("update fc_member_film set review_round = ? where id = ?", nextRound, member_film_id);
-		Integer count = jdbcTemplate.queryForInt("select count(id) from fc_review where film_id = ? and review_round = ?", member_film_id, nextRound);
+		jdbcTemplate.executeUpdate("update fc_member_film_enroll set review_round = ? where film_id = ? and enroll_type_id = ?", nextRound, member_film_id, enroll_type_id);
+		Integer count = jdbcTemplate.queryForInt("select count(id) from fc_review where film_id = ? and review_round = ? and enroll_type_id = ?", member_film_id, nextRound, enroll_type_id);
 		if(count == 0) {
 			Fc_review review = new Fc_review();
+			review.setEnroll_type_id(enroll_type_id);
 			review.setFilm_id(member_film_id.intValue());
 			review.setReview_round(nextRound);
 			review.setReview_state(0);
@@ -477,7 +478,6 @@ public class FilmServiceImpl implements FilmService {
 		}
 	}
 
-	
 	/**
 	 * 检索审片列表
 	 */
@@ -503,7 +503,7 @@ public class FilmServiceImpl implements FilmService {
 
 	@Override
 	@Transactional
-	public void allot(Long member_film_id, Integer review_round, Integer[] user_id) {
+	public void allot(Long member_film_id, Integer enroll_type_id, Integer review_round, Integer[] user_id) {
 		jdbcTemplate.executeUpdate("delete from fc_review_user where film_id = ? and review_round = ?", member_film_id, review_round);
 		jdbcTemplate.executeUpdate("update fc_review set review_state = 1 where film_id = ? and review_round = ? and review_state = 0", member_film_id.intValue(), review_round);
 		if(user_id != null && user_id.length > 0) {
@@ -526,4 +526,9 @@ public class FilmServiceImpl implements FilmService {
 		jdbcTemplate.executeUpdate("update fc_member_film set upload_state = ? where id = ?", upload_state, member_film_id);
 	}
 
+	@Override
+	public List<Fc_member_film_enroll> queryFilmEnrollList(Long member_film_id) {
+		return jdbcTemplate.queryForBeans("select * from fc_member_film_enroll where film_id = ?", Fc_member_film_enroll.class, member_film_id.intValue());
+	}
+
 }

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

@@ -18,9 +18,8 @@ public class UserReviewServiceImpl implements UserReviewService {
 	JdbcTemplate jdbcTemplate;
 
 	@Override
-	public List<Map<String, Object>> queryReviewList(Date push_date, Integer film_type_id, Integer enroll_type_id,
-			String keyword, Page page) {
-		// TODO Auto-generated method stub
+	public List<Map<String, Object>> queryReviewList(Integer[] review_state, Date push_date, Integer film_type_id, Integer enroll_type_id, String keyword, Page page) {
+		String sql = "select mf.* from fc_member_film mf, fc_member_film_enroll mfe, fc_review r where mf.id = mfe.film_id and mfe.enroll_type_id = ? and mf.id = r.film_id and mf.review_round = r.review_round and r.create_time >= and r.create_time < ? and r.review_state in () and ";
 		return null;
 	}
 

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

@@ -24,6 +24,7 @@ import com.egolm.film.api.service.MemberService;
 import com.egolm.film.api.service.Messages;
 import com.egolm.film.bean.Fc_member;
 import com.egolm.film.bean.Fc_member_film;
+import com.egolm.film.bean.Fc_member_film_enroll;
 import com.egolm.film.util.Common;
 
 import io.swagger.annotations.Api;
@@ -111,7 +112,10 @@ public class AdminFirstController {
 		film.setFilm_type_name_short(film_type_name_short);
 		memberFilmService.mergeMemberFilm(film);
 		memberFilmService.pass(member_film_id);
-		memberFilmService.toNextRound(member_film_id);
+		List<Fc_member_film_enroll> enrolls = memberFilmService.queryFilmEnrollList(member_film_id);
+		for(Fc_member_film_enroll enroll : enrolls) {
+			memberFilmService.toNextRound(member_film_id, enroll.getEnroll_type_id());
+		}
 		Fc_member_film memberFilm = memberFilmService.queryMemberFilmById(member_film_id);
 		Fc_member member = memberService.getMemberById(memberFilm.getMember_id());
 		Locale locale = new Locale("zh", "CN");

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

@@ -59,11 +59,12 @@ public class AdminReviewController {
 	@ApiOperation("分配审片评委")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="member_film_id",       value="影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="enroll_type_id",       value="影片性质[申报奖项]ID"),
 		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="review_round",       value="审片环节"),
 		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="user_id",           value="审片评委ID"),
 	})
-	public Object allot(Long member_film_id, Integer review_round, Integer[] user_id) {
-		filmService.allot(member_film_id, review_round, user_id);
+	public Object allot(Long member_film_id, Integer enroll_type_id, Integer review_round, Integer[] user_id) {
+		filmService.allot(member_film_id, enroll_type_id, review_round, user_id);
 		return Rjx.jsonOk();
 	}
 	

src/main/java/com/egolm/film/api/web/user/UserReviewController.java

@@ -44,13 +44,13 @@ public class UserReviewController {
 		@ApiImplicitParam(paramType = "query", dataType = "long",   required = false, name = "limit",    value="分页大小"),
 		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "limitKey", value="分页排序", allowMultiple=true),
 	})
-	public Object getReviewList(Integer review_state, Date push_date, Integer film_type_id, Integer enroll_type_id, String keyword, Long index, Long limit, String[] limitKey) {
+	public Object getReviewList(boolean[] review_state, Date push_date, Integer film_type_id, Integer enroll_type_id, String keyword, Long index, Long limit, String[] limitKey) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		LoginToken loginToken = tokenService.getToken();
 		Long user_id = (Long)loginToken.getId();
 		Page page = new Page(index, limit, limitKey);
-		List<Map<String, Object>> list = service.queryReviewList(push_date, film_type_id, enroll_type_id, keyword, page);
+		List<Map<String, Object>> list = null;//service.queryReviewList(review_state, push_date, film_type_id, enroll_type_id, keyword, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	

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

@@ -292,11 +292,6 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private Long pass_time;
 
-	/**
-	 * 当前审片是第几轮
-	 */
-	private Integer review_round;
-
 	/**
 	 * 上传影片标记
 	 */
@@ -378,12 +373,11 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param film_district 区域
 	 * @param is_check_director 状态
 	 * @param pass_time 通过时间
-	 * @param review_round 当前审片是第几轮
 	 * @param upload_id 上传影片标记
 	 * @param upload_state 上传影片状态(0上传中,1已完成)
 	 * @param upload_time 上传影片时间
 	 */
-	public Fc_member_film(Long id, Integer film_no, String origion_name, String en_name, String cn_name, Integer type, Long film_group_id, Integer film_type, String film_type_name, String show_date, Long show_time, String first_show_date, String first_show_city, Integer is_apply_other_filmfest, String other_filmfest_name, String film_medium, String film_format, String completion_date, String film_country, String co_production_country, String film_producers, String production_company, String enroll_type_name, Integer enroll_type, Integer is_like_show, Long create_time, Integer member_id, String create_ip, Integer state, String prize, String dialogue_lang, String subtitle_lang, String play_shanghai, String has_joined_award, String intro, String en_intro, Long last_modify_time, String film_side_demand, String film_total_time, Integer is_show, String film_apply_company, String film_apply_realname, String film_apply_email, String film_apply_tel, String film_apply_mobile, String film_apply_country, String enroll_type_name_other, String film_format_url, String film_format_passw, String film_format_other, String film_type_name_short, String lang, Integer apply_state, String film_district, Integer is_check_director, Long pass_time, Integer review_round, String upload_id, Integer upload_state, Date upload_time) {
+	public Fc_member_film(Long id, Integer film_no, String origion_name, String en_name, String cn_name, Integer type, Long film_group_id, Integer film_type, String film_type_name, String show_date, Long show_time, String first_show_date, String first_show_city, Integer is_apply_other_filmfest, String other_filmfest_name, String film_medium, String film_format, String completion_date, String film_country, String co_production_country, String film_producers, String production_company, String enroll_type_name, Integer enroll_type, Integer is_like_show, Long create_time, Integer member_id, String create_ip, Integer state, String prize, String dialogue_lang, String subtitle_lang, String play_shanghai, String has_joined_award, String intro, String en_intro, Long last_modify_time, String film_side_demand, String film_total_time, Integer is_show, String film_apply_company, String film_apply_realname, String film_apply_email, String film_apply_tel, String film_apply_mobile, String film_apply_country, String enroll_type_name_other, String film_format_url, String film_format_passw, String film_format_other, String film_type_name_short, String lang, Integer apply_state, String film_district, Integer is_check_director, Long pass_time, String upload_id, Integer upload_state, Date upload_time) {
 		this.id = id;
 		this.film_no = film_no;
 		this.origion_name = origion_name;
@@ -440,7 +434,6 @@ public class Fc_member_film implements java.io.Serializable {
 		this.film_district = film_district;
 		this.is_check_director = is_check_director;
 		this.pass_time = pass_time;
-		this.review_round = review_round;
 		this.upload_id = upload_id;
 		this.upload_state = upload_state;
 		this.upload_time = upload_time;
@@ -894,14 +887,6 @@ public class Fc_member_film implements java.io.Serializable {
 		return pass_time;
 	}
 
-	public void setReview_round(Integer review_round) {
-		this.review_round = review_round;
-	}
-
-	public Integer getReview_round() {
-		return review_round;
-	}
-
 	public void setUpload_id(String upload_id) {
 		this.upload_id = upload_id;
 	}

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

@@ -18,6 +18,8 @@ public class Fc_member_film_enroll implements java.io.Serializable {
 	@Id
 	private Integer enroll_type_id;
 
+	private Integer review_round;
+
 
 	/**
 	 * 无参数构造方法
@@ -30,10 +32,12 @@ public class Fc_member_film_enroll implements java.io.Serializable {
 	 * 全参数构造方法
 	 * @param film_id 
 	 * @param enroll_type_id 
+	 * @param review_round 
 	 */
-	public Fc_member_film_enroll(Integer film_id, Integer enroll_type_id) {
+	public Fc_member_film_enroll(Integer film_id, Integer enroll_type_id, Integer review_round) {
 		this.film_id = film_id;
 		this.enroll_type_id = enroll_type_id;
+		this.review_round = review_round;
 	}
 
 	public void setFilm_id(Integer film_id) {
@@ -52,5 +56,13 @@ public class Fc_member_film_enroll implements java.io.Serializable {
 		return enroll_type_id;
 	}
 
+	public void setReview_round(Integer review_round) {
+		this.review_round = review_round;
+	}
+
+	public Integer getReview_round() {
+		return review_round;
+	}
+
 }
 

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

@@ -25,6 +25,11 @@ public class Fc_review implements java.io.Serializable {
 	 */
 	private Integer film_id;
 
+	/**
+	 * 影片性质(申报奖项)ID
+	 */
+	private Integer enroll_type_id;
+
 	/**
 	 * 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
 	 */
@@ -54,14 +59,16 @@ public class Fc_review implements java.io.Serializable {
 	 * 全参数构造方法
 	 * @param id 审片记录ID
 	 * @param film_id 参审影片ID
+	 * @param enroll_type_id 影片性质(申报奖项)ID
 	 * @param review_state 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
 	 * @param review_round 审片轮数,第几轮审片
 	 * @param result_text 审片结论
 	 * @param create_time 
 	 */
-	public Fc_review(Integer id, Integer film_id, Integer review_state, Integer review_round, String result_text, Date create_time) {
+	public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_state, Integer review_round, String result_text, Date create_time) {
 		this.id = id;
 		this.film_id = film_id;
+		this.enroll_type_id = enroll_type_id;
 		this.review_state = review_state;
 		this.review_round = review_round;
 		this.result_text = result_text;
@@ -84,6 +91,14 @@ public class Fc_review implements java.io.Serializable {
 		return film_id;
 	}
 
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
+	}
+
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
+	}
+
 	public void setReview_state(Integer review_state) {
 		this.review_state = review_state;
 	}

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

@@ -24,6 +24,11 @@ public class Fc_review_user implements java.io.Serializable {
 	@Id
 	private Integer review_round;
 
+	/**
+	 * 影片性质ID
+	 */
+	private Integer enroll_type_id;
+
 	/**
 	 * 评委ID
 	 */
@@ -46,12 +51,14 @@ public class Fc_review_user implements java.io.Serializable {
 	 * 全参数构造方法
 	 * @param film_id 影片ID
 	 * @param review_round 审片环节
+	 * @param enroll_type_id 影片性质ID
 	 * @param user_id 评委ID
 	 * @param view_state 是否观看 0否,1是
 	 */
-	public Fc_review_user(Integer film_id, Integer review_round, Integer user_id, Integer view_state) {
+	public Fc_review_user(Integer film_id, Integer review_round, Integer enroll_type_id, Integer user_id, Integer view_state) {
 		this.film_id = film_id;
 		this.review_round = review_round;
+		this.enroll_type_id = enroll_type_id;
 		this.user_id = user_id;
 		this.view_state = view_state;
 	}
@@ -72,6 +79,14 @@ public class Fc_review_user implements java.io.Serializable {
 		return review_round;
 	}
 
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
+	}
+
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
+	}
+
 	public void setUser_id(Integer user_id) {
 		this.user_id = user_id;
 	}

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

@@ -28,6 +28,11 @@ public class Fc_review_user_result implements java.io.Serializable {
 	 */
 	private Integer review_state;
 
+	/**
+	 * 影片性质ID
+	 */
+	private Integer enroll_type_id;
+
 	/**
 	 * 得分分数
 	 */
@@ -74,6 +79,7 @@ public class Fc_review_user_result implements java.io.Serializable {
 	 * @param review_id 
 	 * @param review_round 
 	 * @param review_state 2通过,3否决,4参赛,5参赛备选,6参展
+	 * @param enroll_type_id 影片性质ID
 	 * @param review_score 得分分数
 	 * @param review_text 影片评论
 	 * @param review_text_summary 影片概述
@@ -81,13 +87,14 @@ public class Fc_review_user_result implements java.io.Serializable {
 	 * @param review_text_style 风格/美学
 	 * @param review_text_keynote 突出/优缺点
 	 */
-	public Fc_review_user_result(Integer id, Integer film_id, Integer user_id, Integer review_id, Integer review_round, Integer review_state, Double review_score, String review_text, String review_text_summary, String review_text_theme, String review_text_style, String review_text_keynote) {
+	public Fc_review_user_result(Integer id, Integer film_id, Integer user_id, Integer review_id, Integer review_round, Integer review_state, Integer enroll_type_id, Double review_score, String review_text, String review_text_summary, String review_text_theme, String review_text_style, String review_text_keynote) {
 		this.id = id;
 		this.film_id = film_id;
 		this.user_id = user_id;
 		this.review_id = review_id;
 		this.review_round = review_round;
 		this.review_state = review_state;
+		this.enroll_type_id = enroll_type_id;
 		this.review_score = review_score;
 		this.review_text = review_text;
 		this.review_text_summary = review_text_summary;
@@ -144,6 +151,14 @@ public class Fc_review_user_result implements java.io.Serializable {
 		return review_state;
 	}
 
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
+	}
+
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
+	}
+
 	public void setReview_score(Double review_score) {
 		this.review_score = review_score;
 	}

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

@@ -15,14 +15,34 @@ public class Fc_review_user_result_doubtful implements java.io.Serializable {
 	@Id
 	private Integer id;
 
+	/**
+	 * 影片ID
+	 */
 	private Integer film_id;
 
+	/**
+	 * 审片环节ID
+	 */
 	private Integer review_round;
 
+	/**
+	 * 影片性质ID
+	 */
+	private Integer enroll_type_id;
+
+	/**
+	 * 评委ID
+	 */
 	private Integer user_id;
 
+	/**
+	 * 评委审片结论ID
+	 */
 	private Integer result_id;
 
+	/**
+	 * 疑点
+	 */
 	private String review_text;
 
 
@@ -36,16 +56,18 @@ public class Fc_review_user_result_doubtful implements java.io.Serializable {
 	/**
 	 * 全参数构造方法
 	 * @param id 
-	 * @param film_id 
-	 * @param review_round 
-	 * @param user_id 
-	 * @param result_id 
-	 * @param review_text 
+	 * @param film_id 影片ID
+	 * @param review_round 审片环节ID
+	 * @param enroll_type_id 影片性质ID
+	 * @param user_id 评委ID
+	 * @param result_id 评委审片结论ID
+	 * @param review_text 疑点
 	 */
-	public Fc_review_user_result_doubtful(Integer id, Integer film_id, Integer review_round, Integer user_id, Integer result_id, String review_text) {
+	public Fc_review_user_result_doubtful(Integer id, Integer film_id, Integer review_round, Integer enroll_type_id, Integer user_id, Integer result_id, String review_text) {
 		this.id = id;
 		this.film_id = film_id;
 		this.review_round = review_round;
+		this.enroll_type_id = enroll_type_id;
 		this.user_id = user_id;
 		this.result_id = result_id;
 		this.review_text = review_text;
@@ -75,6 +97,14 @@ public class Fc_review_user_result_doubtful implements java.io.Serializable {
 		return review_round;
 	}
 
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
+	}
+
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
+	}
+
 	public void setUser_id(Integer user_id) {
 		this.user_id = user_id;
 	}

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

@@ -15,18 +15,44 @@ public class Fc_review_user_result_ext implements java.io.Serializable {
 	@Id
 	private Integer id;
 
+	/**
+	 * 影片ID
+	 */
 	private Integer film_id;
 
+	/**
+	 * 审片环节
+	 */
 	private Integer review_round;
 
+	/**
+	 * 影片性质ID
+	 */
+	private Integer enroll_type_id;
+
+	/**
+	 * 评委ID
+	 */
 	private Integer user_id;
 
+	/**
+	 * 评委审片结论ID
+	 */
 	private Integer result_id;
 
-	private Integer enroll_type_id;
+	/**
+	 * 影片申报奖项ID
+	 */
+	private Integer enroll_ext_id;
 
-	private Double enroll_score;
+	/**
+	 * 影片申报奖项评分
+	 */
+	private Double enroll_ext_score;
 
+	/**
+	 * 评委审片结论
+	 */
 	private String review_text;
 
 
@@ -40,22 +66,24 @@ public class Fc_review_user_result_ext implements java.io.Serializable {
 	/**
 	 * 全参数构造方法
 	 * @param id 
-	 * @param film_id 
-	 * @param review_round 
-	 * @param user_id 
-	 * @param result_id 
-	 * @param enroll_type_id 
-	 * @param enroll_score 
-	 * @param review_text 
+	 * @param film_id 影片ID
+	 * @param review_round 审片环节
+	 * @param enroll_type_id 影片性质ID
+	 * @param user_id 评委ID
+	 * @param result_id 评委审片结论ID
+	 * @param enroll_ext_id 影片申报奖项ID
+	 * @param enroll_ext_score 影片申报奖项评分
+	 * @param review_text 评委审片结论
 	 */
-	public Fc_review_user_result_ext(Integer id, Integer film_id, Integer review_round, Integer user_id, Integer result_id, Integer enroll_type_id, Double enroll_score, String review_text) {
+	public Fc_review_user_result_ext(Integer id, Integer film_id, Integer review_round, Integer enroll_type_id, Integer user_id, Integer result_id, Integer enroll_ext_id, Double enroll_ext_score, String review_text) {
 		this.id = id;
 		this.film_id = film_id;
 		this.review_round = review_round;
+		this.enroll_type_id = enroll_type_id;
 		this.user_id = user_id;
 		this.result_id = result_id;
-		this.enroll_type_id = enroll_type_id;
-		this.enroll_score = enroll_score;
+		this.enroll_ext_id = enroll_ext_id;
+		this.enroll_ext_score = enroll_ext_score;
 		this.review_text = review_text;
 	}
 
@@ -83,6 +111,14 @@ public class Fc_review_user_result_ext implements java.io.Serializable {
 		return review_round;
 	}
 
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
+	}
+
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
+	}
+
 	public void setUser_id(Integer user_id) {
 		this.user_id = user_id;
 	}
@@ -99,20 +135,20 @@ public class Fc_review_user_result_ext implements java.io.Serializable {
 		return result_id;
 	}
 
-	public void setEnroll_type_id(Integer enroll_type_id) {
-		this.enroll_type_id = enroll_type_id;
+	public void setEnroll_ext_id(Integer enroll_ext_id) {
+		this.enroll_ext_id = enroll_ext_id;
 	}
 
-	public Integer getEnroll_type_id() {
-		return enroll_type_id;
+	public Integer getEnroll_ext_id() {
+		return enroll_ext_id;
 	}
 
-	public void setEnroll_score(Double enroll_score) {
-		this.enroll_score = enroll_score;
+	public void setEnroll_ext_score(Double enroll_ext_score) {
+		this.enroll_ext_score = enroll_ext_score;
 	}
 
-	public Double getEnroll_score() {
-		return enroll_score;
+	public Double getEnroll_ext_score() {
+		return enroll_ext_score;
 	}
 
 	public void setReview_text(String review_text) {