x

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

@@ -48,4 +48,16 @@ public class AdminReviewController {
 		return Rjx.jsonOk().setData(list).setPage(page);
 	} 
 	
+	@ResponseBody
+	@PostMapping("allot")
+	@ApiOperation("分配审片评委")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="long",    required=true, name="member_film_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) {
+		return Rjx.jsonOk();
+	}
+	
 }

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

@@ -32,6 +32,8 @@ public class Fc_admin_menu implements java.io.Serializable {
 
 	private String menu_icon;
 
+	private String remark;
+
 
 	/**
 	 * 无参数构造方法
@@ -50,8 +52,9 @@ public class Fc_admin_menu implements java.io.Serializable {
 	 * @param menu_no 
 	 * @param menu_link 
 	 * @param menu_icon 
+	 * @param remark 
 	 */
-	public Fc_admin_menu(Integer menu_id, Integer menu_type, Integer parent_id, Integer order_num, String menu_name, String menu_no, String menu_link, String menu_icon) {
+	public Fc_admin_menu(Integer menu_id, Integer menu_type, Integer parent_id, Integer order_num, String menu_name, String menu_no, String menu_link, String menu_icon, String remark) {
 		this.menu_id = menu_id;
 		this.menu_type = menu_type;
 		this.parent_id = parent_id;
@@ -60,6 +63,7 @@ public class Fc_admin_menu implements java.io.Serializable {
 		this.menu_no = menu_no;
 		this.menu_link = menu_link;
 		this.menu_icon = menu_icon;
+		this.remark = remark;
 	}
 
 	public void setMenu_id(Integer menu_id) {
@@ -126,5 +130,13 @@ public class Fc_admin_menu implements java.io.Serializable {
 		return menu_icon;
 	}
 
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
 }
 

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

@@ -55,11 +55,6 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private String film_type_name;
 
-	/**
-	 * 短片类型
-	 */
-	private String film_type_name_short;
-
 	/**
 	 * 放映时间
 	 */
@@ -155,6 +150,11 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private String create_ip;
 
+	/**
+	 * 状态
+	 */
+	private Integer state;
+
 	/**
 	 * 该片已参加过的电影节及所获奖项
 	 */
@@ -261,25 +261,20 @@ public class Fc_member_film implements java.io.Serializable {
 	private String film_format_other;
 
 	/**
-	 * 语言
+	 * 短片类型
 	 */
-	private String lang;
+	private String film_type_name_short;
 
 	/**
-	 * 状态
+	 * 语言
 	 */
-	private Integer state;
+	private String lang;
 
 	/**
-	 * 初审状态
+	 * 状态
 	 */
 	private Integer apply_state;
 
-	/**
-	 * 初审结论
-	 */
-	private String apply_state_intro;
-
 	/**
 	 * 区域
 	 */
@@ -319,7 +314,6 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param film_group_id 影片内容分组id
 	 * @param film_type 影片类型
 	 * @param film_type_name 导入时影片类型名称
-	 * @param film_type_name_short 短片类型
 	 * @param show_date 放映时间
 	 * @param show_time 上映时间
 	 * @param first_show_date 首次上映时间
@@ -339,6 +333,7 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param create_time 添加时间
 	 * @param member_id 管理员id
 	 * @param create_ip 创建ip
+	 * @param state 状态
 	 * @param prize 该片已参加过的电影节及所获奖项
 	 * @param dialogue_lang 对白语言
 	 * @param subtitle_lang 字幕语言
@@ -360,16 +355,15 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param film_format_url 样片url
 	 * @param film_format_passw 样片url密码
 	 * @param film_format_other 样片url其他
+	 * @param film_type_name_short 短片类型
 	 * @param lang 语言
-	 * @param state 状态
-	 * @param apply_state 初审状态
-	 * @param apply_state_intro 初审结论
+	 * @param apply_state 状态
 	 * @param film_district 区域
 	 * @param is_check_director 状态
 	 * @param pass_time 通过时间
 	 * @param review_round 当前审片是第几轮
 	 */
-	public Fc_member_film(Long id, String 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 film_type_name_short, 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, 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 lang, Integer state, Integer apply_state, String apply_state_intro, String film_district, Integer is_check_director, Long pass_time, Integer review_round) {
+	public Fc_member_film(Long id, String 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) {
 		this.id = id;
 		this.film_no = film_no;
 		this.origion_name = origion_name;
@@ -379,7 +373,6 @@ public class Fc_member_film implements java.io.Serializable {
 		this.film_group_id = film_group_id;
 		this.film_type = film_type;
 		this.film_type_name = film_type_name;
-		this.film_type_name_short = film_type_name_short;
 		this.show_date = show_date;
 		this.show_time = show_time;
 		this.first_show_date = first_show_date;
@@ -399,6 +392,7 @@ public class Fc_member_film implements java.io.Serializable {
 		this.create_time = create_time;
 		this.member_id = member_id;
 		this.create_ip = create_ip;
+		this.state = state;
 		this.prize = prize;
 		this.dialogue_lang = dialogue_lang;
 		this.subtitle_lang = subtitle_lang;
@@ -420,10 +414,9 @@ public class Fc_member_film implements java.io.Serializable {
 		this.film_format_url = film_format_url;
 		this.film_format_passw = film_format_passw;
 		this.film_format_other = film_format_other;
+		this.film_type_name_short = film_type_name_short;
 		this.lang = lang;
-		this.state = state;
 		this.apply_state = apply_state;
-		this.apply_state_intro = apply_state_intro;
 		this.film_district = film_district;
 		this.is_check_director = is_check_director;
 		this.pass_time = pass_time;
@@ -502,14 +495,6 @@ public class Fc_member_film implements java.io.Serializable {
 		return film_type_name;
 	}
 
-	public void setFilm_type_name_short(String film_type_name_short) {
-		this.film_type_name_short = film_type_name_short;
-	}
-
-	public String getFilm_type_name_short() {
-		return film_type_name_short;
-	}
-
 	public void setShow_date(String show_date) {
 		this.show_date = show_date;
 	}
@@ -662,6 +647,14 @@ public class Fc_member_film implements java.io.Serializable {
 		return create_ip;
 	}
 
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
 	public void setPrize(String prize) {
 		this.prize = prize;
 	}
@@ -830,20 +823,20 @@ public class Fc_member_film implements java.io.Serializable {
 		return film_format_other;
 	}
 
-	public void setLang(String lang) {
-		this.lang = lang;
+	public void setFilm_type_name_short(String film_type_name_short) {
+		this.film_type_name_short = film_type_name_short;
 	}
 
-	public String getLang() {
-		return lang;
+	public String getFilm_type_name_short() {
+		return film_type_name_short;
 	}
 
-	public void setState(Integer state) {
-		this.state = state;
+	public void setLang(String lang) {
+		this.lang = lang;
 	}
 
-	public Integer getState() {
-		return state;
+	public String getLang() {
+		return lang;
 	}
 
 	public void setApply_state(Integer apply_state) {
@@ -854,14 +847,6 @@ public class Fc_member_film implements java.io.Serializable {
 		return apply_state;
 	}
 
-	public void setApply_state_intro(String apply_state_intro) {
-		this.apply_state_intro = apply_state_intro;
-	}
-
-	public String getApply_state_intro() {
-		return apply_state_intro;
-	}
-
 	public void setFilm_district(String film_district) {
 		this.film_district = film_district;
 	}

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

@@ -15,11 +15,6 @@ public class Fc_member_film_show implements java.io.Serializable {
 	@Id
 	private Integer id;
 
-	/**
-	 * 报名影片ID
-	 */
-	private Integer film_id;
-
 	/**
 	 * 参加过什么电影节
 	 */
@@ -35,6 +30,11 @@ public class Fc_member_film_show implements java.io.Serializable {
 	 */
 	private String show_filmfest_date;
 
+	/**
+	 * 报名影片ID
+	 */
+	private Integer film_id;
+
 	/**
 	 * 简介（获奖或报名奖项等）
 	 */
@@ -53,19 +53,19 @@ public class Fc_member_film_show implements java.io.Serializable {
 	/**
 	 * 全参数构造方法
 	 * @param id 
-	 * @param film_id 报名影片ID
 	 * @param show_filmfest 参加过什么电影节
 	 * @param show_filmfest_type 参与类型
 	 * @param show_filmfest_date 时间
+	 * @param film_id 报名影片ID
 	 * @param show_filmfest_intro 简介（获奖或报名奖项等）
 	 * @param create_time 
 	 */
-	public Fc_member_film_show(Integer id, Integer film_id, String show_filmfest, String show_filmfest_type, String show_filmfest_date, String show_filmfest_intro, Integer create_time) {
+	public Fc_member_film_show(Integer id, String show_filmfest, String show_filmfest_type, String show_filmfest_date, Integer film_id, String show_filmfest_intro, Integer create_time) {
 		this.id = id;
-		this.film_id = film_id;
 		this.show_filmfest = show_filmfest;
 		this.show_filmfest_type = show_filmfest_type;
 		this.show_filmfest_date = show_filmfest_date;
+		this.film_id = film_id;
 		this.show_filmfest_intro = show_filmfest_intro;
 		this.create_time = create_time;
 	}
@@ -78,14 +78,6 @@ public class Fc_member_film_show implements java.io.Serializable {
 		return id;
 	}
 
-	public void setFilm_id(Integer film_id) {
-		this.film_id = film_id;
-	}
-
-	public Integer getFilm_id() {
-		return film_id;
-	}
-
 	public void setShow_filmfest(String show_filmfest) {
 		this.show_filmfest = show_filmfest;
 	}
@@ -110,6 +102,14 @@ public class Fc_member_film_show implements java.io.Serializable {
 		return show_filmfest_date;
 	}
 
+	public void setFilm_id(Integer film_id) {
+		this.film_id = film_id;
+	}
+
+	public Integer getFilm_id() {
+		return film_id;
+	}
+
 	public void setShow_filmfest_intro(String show_filmfest_intro) {
 		this.show_filmfest_intro = show_filmfest_intro;
 	}

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

@@ -2,6 +2,8 @@ package com.egolm.film.bean;
 
 import javax.persistence.Entity;
 
+import javax.persistence.Id;
+
 /**
  * @author 曲欣亮
  */
@@ -11,9 +13,16 @@ public class Fc_review_user implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 评审ID
+	 * 影片ID
+	 */
+	@Id
+	private Integer film_id;
+
+	/**
+	 * 审片环节
 	 */
-	private Integer review_id;
+	@Id
+	private Integer review_round;
 
 	/**
 	 * 评委ID
@@ -35,22 +44,32 @@ public class Fc_review_user implements java.io.Serializable {
 
 	/**
 	 * 全参数构造方法
-	 * @param review_id 评审ID
+	 * @param film_id 影片ID
+	 * @param review_round 审片环节
 	 * @param user_id 评委ID
 	 * @param view_state 是否观看 0否,1是
 	 */
-	public Fc_review_user(Integer review_id, Integer user_id, Integer view_state) {
-		this.review_id = review_id;
+	public Fc_review_user(Integer film_id, Integer review_round, Integer user_id, Integer view_state) {
+		this.film_id = film_id;
+		this.review_round = review_round;
 		this.user_id = user_id;
 		this.view_state = view_state;
 	}
 
-	public void setReview_id(Integer review_id) {
-		this.review_id = review_id;
+	public void setFilm_id(Integer film_id) {
+		this.film_id = film_id;
+	}
+
+	public Integer getFilm_id() {
+		return film_id;
+	}
+
+	public void setReview_round(Integer review_round) {
+		this.review_round = review_round;
 	}
 
-	public Integer getReview_id() {
-		return review_id;
+	public Integer getReview_round() {
+		return review_round;
 	}
 
 	public void setUser_id(Integer user_id) {