xx

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

@@ -21,9 +21,9 @@ import com.egolm.common.jdbc.Page;
 import com.egolm.common.web.ServletUtil;
 import com.egolm.film.api.service.FilmService;
 import com.egolm.film.api.service.Messages;
-import com.egolm.film.bean.Fc_film_enroll;
 import com.egolm.film.bean.Fc_member_film;
 import com.egolm.film.bean.Fc_member_film_all;
+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;
@@ -115,15 +115,15 @@ public class FilmServiceImpl implements FilmService {
 		
 		Long film_id = keyHolder.getKey().longValue();
 		
-		List<Fc_film_enroll> enrolls = new ArrayList<Fc_film_enroll>();
+		List<Fc_member_film_enroll> enrolls = new ArrayList<Fc_member_film_enroll>();
 		if(enroll_type_name != null) {
 			String[] strs = enroll_type_name.split(",");
 			if(strs != null && strs.length > 0) {
 				for(String str : strs) {
 					if(str != null && str.matches("\\d+")) {
-						Fc_film_enroll enroll = new Fc_film_enroll();
-						enroll.setFilm_enroll_id(Integer.valueOf(str));
-						enroll.setFilm_id(film_id);
+						Fc_member_film_enroll enroll = new Fc_member_film_enroll();
+						enroll.setEnroll_type_id(Integer.valueOf(str));
+						enroll.setFilm_id(film_id.intValue());
 						enrolls.add(enroll);
 					}
 				}

src/main/java/com/egolm/film/bean/Fc_enroll_type.java → src/main/java/com/egolm/film/bean/Enum_enroll.java

@@ -7,8 +7,8 @@ import javax.persistence.Id;
 /**
  * @author 曲欣亮
  */
-@Entity(name="fc_enroll_type")
-public class Fc_enroll_type implements java.io.Serializable {
+@Entity(name="enum_enroll")
+public class Enum_enroll implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -27,7 +27,7 @@ public class Fc_enroll_type implements java.io.Serializable {
 	/**
 	 * 无参数构造方法
 	 */
-	public Fc_enroll_type () {
+	public Enum_enroll () {
 		super();
 	}
 
@@ -36,7 +36,7 @@ public class Fc_enroll_type implements java.io.Serializable {
 	 * @param enroll_type 影片性质ID
 	 * @param enroll_type_name 影片性质名称
 	 */
-	public Fc_enroll_type(Integer enroll_type, String enroll_type_name) {
+	public Enum_enroll(Integer enroll_type, String enroll_type_name) {
 		this.enroll_type = enroll_type;
 		this.enroll_type_name = enroll_type_name;
 	}

src/main/java/com/egolm/film/bean/Fc_film_type.java → src/main/java/com/egolm/film/bean/Enum_filmtype.java

@@ -7,8 +7,8 @@ import javax.persistence.Id;
 /**
  * @author 曲欣亮
  */
-@Entity(name="fc_film_type")
-public class Fc_film_type implements java.io.Serializable {
+@Entity(name="enum_filmtype")
+public class Enum_filmtype implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -27,7 +27,7 @@ public class Fc_film_type implements java.io.Serializable {
 	/**
 	 * 无参数构造方法
 	 */
-	public Fc_film_type () {
+	public Enum_filmtype () {
 		super();
 	}
 
@@ -36,7 +36,7 @@ public class Fc_film_type implements java.io.Serializable {
 	 * @param film_type 影片类型ID
 	 * @param film_type_name 影片类型名称
 	 */
-	public Fc_film_type(Integer film_type, String film_type_name) {
+	public Enum_filmtype(Integer film_type, String film_type_name) {
 		this.film_type = film_type;
 		this.film_type_name = film_type_name;
 	}

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

@@ -137,5 +137,9 @@ public class Fc_logs implements java.io.Serializable {
 		return create_time;
 	}
 
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
 }
 

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

@@ -55,6 +55,11 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private String film_type_name;
 
+	/**
+	 * 短片类型
+	 */
+	private String film_type_name_short;
+
 	/**
 	 * 放映时间
 	 */
@@ -260,11 +265,6 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private String film_format_other;
 
-	/**
-	 * 短片类型
-	 */
-	private String film_type_name_short;
-
 	/**
 	 * 语言
 	 */
@@ -309,6 +309,7 @@ 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 首次上映时间
@@ -350,14 +351,13 @@ 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 apply_state 状态
 	 * @param film_district 区域
 	 * @param is_check_director 状态
 	 * @param pass_time 通过时间
 	 */
-	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) {
+	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, 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 lang, Integer apply_state, String film_district, Integer is_check_director, Long pass_time) {
 		this.id = id;
 		this.film_no = film_no;
 		this.origion_name = origion_name;
@@ -367,6 +367,7 @@ 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;
@@ -408,7 +409,6 @@ 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.apply_state = apply_state;
 		this.film_district = film_district;
@@ -488,6 +488,14 @@ 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;
 	}
@@ -816,14 +824,6 @@ public class Fc_member_film implements java.io.Serializable {
 		return film_format_other;
 	}
 
-	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 setLang(String lang) {
 		this.lang = lang;
 	}

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

@@ -7,49 +7,49 @@ import javax.persistence.Id;
 /**
  * @author 曲欣亮
  */
-@Entity(name="fc_film_enroll")
-public class Fc_film_enroll implements java.io.Serializable {
+@Entity(name="fc_member_film_enroll")
+public class Fc_member_film_enroll implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	private Long film_id;
+	private Integer film_id;
 
 	@Id
-	private Integer film_enroll_id;
+	private Integer enroll_type_id;
 
 
 	/**
 	 * 无参数构造方法
 	 */
-	public Fc_film_enroll () {
+	public Fc_member_film_enroll () {
 		super();
 	}
 
 	/**
 	 * 全参数构造方法
 	 * @param film_id 
-	 * @param film_enroll_id 
+	 * @param enroll_type_id 
 	 */
-	public Fc_film_enroll(Long film_id, Integer film_enroll_id) {
+	public Fc_member_film_enroll(Integer film_id, Integer enroll_type_id) {
 		this.film_id = film_id;
-		this.film_enroll_id = film_enroll_id;
+		this.enroll_type_id = enroll_type_id;
 	}
 
-	public void setFilm_id(Long film_id) {
+	public void setFilm_id(Integer film_id) {
 		this.film_id = film_id;
 	}
 
-	public Long getFilm_id() {
+	public Integer getFilm_id() {
 		return film_id;
 	}
 
-	public void setFilm_enroll_id(Integer film_enroll_id) {
-		this.film_enroll_id = film_enroll_id;
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
 	}
 
-	public Integer getFilm_enroll_id() {
-		return film_enroll_id;
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
 	}
 
 }

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

+package com.egolm.film.bean;
+
+import javax.persistence.Entity;
+
+import javax.persistence.Id;
+
+/**
+ * @author 曲欣亮
+ */
+@Entity(name="fc_member_film_enroll_ext")
+public class Fc_member_film_enroll_ext implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	private Integer film_id;
+
+	@Id
+	private Integer enroll_type_ext_id;
+
+
+	/**
+	 * 无参数构造方法
+	 */
+	public Fc_member_film_enroll_ext () {
+		super();
+	}
+
+	/**
+	 * 全参数构造方法
+	 * @param film_id 
+	 * @param enroll_type_ext_id 
+	 */
+	public Fc_member_film_enroll_ext(Integer film_id, Integer enroll_type_ext_id) {
+		this.film_id = film_id;
+		this.enroll_type_ext_id = enroll_type_ext_id;
+	}
+
+	public void setFilm_id(Integer film_id) {
+		this.film_id = film_id;
+	}
+
+	public Integer getFilm_id() {
+		return film_id;
+	}
+
+	public void setEnroll_type_ext_id(Integer enroll_type_ext_id) {
+		this.enroll_type_ext_id = enroll_type_ext_id;
+	}
+
+	public Integer getEnroll_type_ext_id() {
+		return enroll_type_ext_id;
+	}
+
+}
+

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

@@ -15,6 +15,11 @@ public class Fc_member_film_show implements java.io.Serializable {
 	@Id
 	private Integer id;
 
+	/**
+	 * 报名影片ID
+	 */
+	private Integer film_id;
+
 	/**
 	 * 参加过什么电影节
 	 */
@@ -30,11 +35,6 @@ 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, String show_filmfest, String show_filmfest_type, String show_filmfest_date, Integer film_id, String show_filmfest_intro, Integer 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) {
 		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,6 +78,14 @@ 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;
 	}
@@ -102,14 +110,6 @@ 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;
 	}