Merge branch 'master' of http://gitlab.egolm.com/hanxu/siff-film-api

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

@@ -307,6 +307,71 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private Date upload_time;
 
+	/**
+	 * 放映费用
+	 */
+	private Double charge_show;
+
+	/**
+	 * 费用币种
+	 */
+	private String charge_show_currency;
+
+	/**
+	 * 密钥费用
+	 */
+	private Double charge_key;
+
+	/**
+	 * 费用币种
+	 */
+	private String charge_key_currency;
+
+	/**
+	 * 拷贝运输费用
+	 */
+	private Double charge_copy;
+
+	/**
+	 * 费用币种
+	 */
+	private String charge_copy_currency;
+
+	/**
+	 * 是否观众见面会
+	 */
+	private Integer is_viewer_metting;
+
+	/**
+	 * 是否重点影片
+	 */
+	private Integer is_important;
+
+	/**
+	 * 是否夜场
+	 */
+	private Integer is_night;
+
+	/**
+	 * 拷贝密钥????????不知是产品还是甲方给的狗屁需求,也不讲明白
+	 */
+	private Integer is_copy_key;
+
+	/**
+	 * 放映场次
+	 */
+	private Integer show_number;
+
+	/**
+	 * 片方要求
+	 */
+	private String film_requirement;
+
+	/**
+	 * 拷贝选项
+	 */
+	private String copy_options;
+
 
 	/**
 	 * 无参数构造方法
@@ -376,8 +441,21 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param upload_id 上传影片标记
 	 * @param upload_state 上传影片状态(0上传中,1已完成)
 	 * @param upload_time 上传影片时间
+	 * @param charge_show 放映费用
+	 * @param charge_show_currency 费用币种
+	 * @param charge_key 密钥费用
+	 * @param charge_key_currency 费用币种
+	 * @param charge_copy 拷贝运输费用
+	 * @param charge_copy_currency 费用币种
+	 * @param is_viewer_metting 是否观众见面会
+	 * @param is_important 是否重点影片
+	 * @param is_night 是否夜场
+	 * @param is_copy_key 拷贝密钥????????不知是产品还是甲方给的狗屁需求,也不讲明白
+	 * @param show_number 放映场次
+	 * @param film_requirement 片方要求
+	 * @param copy_options 拷贝选项
 	 */
-	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) {
+	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, Double charge_show, String charge_show_currency, Double charge_key, String charge_key_currency, Double charge_copy, String charge_copy_currency, Integer is_viewer_metting, Integer is_important, Integer is_night, Integer is_copy_key, Integer show_number, String film_requirement, String copy_options) {
 		this.id = id;
 		this.film_no = film_no;
 		this.origion_name = origion_name;
@@ -437,6 +515,19 @@ public class Fc_member_film implements java.io.Serializable {
 		this.upload_id = upload_id;
 		this.upload_state = upload_state;
 		this.upload_time = upload_time;
+		this.charge_show = charge_show;
+		this.charge_show_currency = charge_show_currency;
+		this.charge_key = charge_key;
+		this.charge_key_currency = charge_key_currency;
+		this.charge_copy = charge_copy;
+		this.charge_copy_currency = charge_copy_currency;
+		this.is_viewer_metting = is_viewer_metting;
+		this.is_important = is_important;
+		this.is_night = is_night;
+		this.is_copy_key = is_copy_key;
+		this.show_number = show_number;
+		this.film_requirement = film_requirement;
+		this.copy_options = copy_options;
 	}
 
 	public void setId(Long id) {
@@ -911,5 +1002,109 @@ public class Fc_member_film implements java.io.Serializable {
 		return upload_time;
 	}
 
+	public void setCharge_show(Double charge_show) {
+		this.charge_show = charge_show;
+	}
+
+	public Double getCharge_show() {
+		return charge_show;
+	}
+
+	public void setCharge_show_currency(String charge_show_currency) {
+		this.charge_show_currency = charge_show_currency;
+	}
+
+	public String getCharge_show_currency() {
+		return charge_show_currency;
+	}
+
+	public void setCharge_key(Double charge_key) {
+		this.charge_key = charge_key;
+	}
+
+	public Double getCharge_key() {
+		return charge_key;
+	}
+
+	public void setCharge_key_currency(String charge_key_currency) {
+		this.charge_key_currency = charge_key_currency;
+	}
+
+	public String getCharge_key_currency() {
+		return charge_key_currency;
+	}
+
+	public void setCharge_copy(Double charge_copy) {
+		this.charge_copy = charge_copy;
+	}
+
+	public Double getCharge_copy() {
+		return charge_copy;
+	}
+
+	public void setCharge_copy_currency(String charge_copy_currency) {
+		this.charge_copy_currency = charge_copy_currency;
+	}
+
+	public String getCharge_copy_currency() {
+		return charge_copy_currency;
+	}
+
+	public void setIs_viewer_metting(Integer is_viewer_metting) {
+		this.is_viewer_metting = is_viewer_metting;
+	}
+
+	public Integer getIs_viewer_metting() {
+		return is_viewer_metting;
+	}
+
+	public void setIs_important(Integer is_important) {
+		this.is_important = is_important;
+	}
+
+	public Integer getIs_important() {
+		return is_important;
+	}
+
+	public void setIs_night(Integer is_night) {
+		this.is_night = is_night;
+	}
+
+	public Integer getIs_night() {
+		return is_night;
+	}
+
+	public void setIs_copy_key(Integer is_copy_key) {
+		this.is_copy_key = is_copy_key;
+	}
+
+	public Integer getIs_copy_key() {
+		return is_copy_key;
+	}
+
+	public void setShow_number(Integer show_number) {
+		this.show_number = show_number;
+	}
+
+	public Integer getShow_number() {
+		return show_number;
+	}
+
+	public void setFilm_requirement(String film_requirement) {
+		this.film_requirement = film_requirement;
+	}
+
+	public String getFilm_requirement() {
+		return film_requirement;
+	}
+
+	public void setCopy_options(String copy_options) {
+		this.copy_options = copy_options;
+	}
+
+	public String getCopy_options() {
+		return copy_options;
+	}
+
 }
 

src/main/java/com/egolm/film/bean/model/Fc_member_film_base_model.java

@@ -48,6 +48,19 @@ public class Fc_member_film_base_model implements Serializable{
 	@ApiModelProperty("影片申请人电话")String film_apply_tel;
 	@ApiModelProperty("影片申请人手机")String film_apply_mobile;
 	@ApiModelProperty("影片申请人国籍")String film_apply_country;
+	@ApiModelProperty("放映费用")private Double charge_show;
+	@ApiModelProperty("放映费用币种")private String charge_show_currency;
+	@ApiModelProperty("密钥费用")private Double charge_key;
+	@ApiModelProperty("密钥费用币种")private String charge_key_currency;
+	@ApiModelProperty("拷贝运输费用")private Double charge_copy;
+	@ApiModelProperty("拷贝运输费用币种")private String charge_copy_currency;
+	@ApiModelProperty("是否观众见面会")private Integer is_viewer_metting;
+	@ApiModelProperty("是否重点影片")private Integer is_important;
+	@ApiModelProperty("是否夜场")private Integer is_night;
+	@ApiModelProperty("拷贝密钥????????不知是产品还是甲方给的狗屁需求,也不讲明白")private Integer is_copy_key;
+	@ApiModelProperty("放映场次")private Integer show_number;
+	@ApiModelProperty("片方要求")private String film_requirement;
+	@ApiModelProperty("拷贝选项")private String copy_options;
 	
 	public Long getMember_film_id() {
 		return member_film_id;
@@ -238,5 +251,83 @@ public class Fc_member_film_base_model implements Serializable{
 	public void setOrigion_name(String origion_name) {
 		this.origion_name = origion_name;
 	}
+	public Double getCharge_show() {
+		return charge_show;
+	}
+	public void setCharge_show(Double charge_show) {
+		this.charge_show = charge_show;
+	}
+	public String getCharge_show_currency() {
+		return charge_show_currency;
+	}
+	public void setCharge_show_currency(String charge_show_currency) {
+		this.charge_show_currency = charge_show_currency;
+	}
+	public Double getCharge_key() {
+		return charge_key;
+	}
+	public void setCharge_key(Double charge_key) {
+		this.charge_key = charge_key;
+	}
+	public String getCharge_key_currency() {
+		return charge_key_currency;
+	}
+	public void setCharge_key_currency(String charge_key_currency) {
+		this.charge_key_currency = charge_key_currency;
+	}
+	public Double getCharge_copy() {
+		return charge_copy;
+	}
+	public void setCharge_copy(Double charge_copy) {
+		this.charge_copy = charge_copy;
+	}
+	public String getCharge_copy_currency() {
+		return charge_copy_currency;
+	}
+	public void setCharge_copy_currency(String charge_copy_currency) {
+		this.charge_copy_currency = charge_copy_currency;
+	}
+	public Integer getIs_viewer_metting() {
+		return is_viewer_metting;
+	}
+	public void setIs_viewer_metting(Integer is_viewer_metting) {
+		this.is_viewer_metting = is_viewer_metting;
+	}
+	public Integer getIs_important() {
+		return is_important;
+	}
+	public void setIs_important(Integer is_important) {
+		this.is_important = is_important;
+	}
+	public Integer getIs_night() {
+		return is_night;
+	}
+	public void setIs_night(Integer is_night) {
+		this.is_night = is_night;
+	}
+	public Integer getIs_copy_key() {
+		return is_copy_key;
+	}
+	public void setIs_copy_key(Integer is_copy_key) {
+		this.is_copy_key = is_copy_key;
+	}
+	public Integer getShow_number() {
+		return show_number;
+	}
+	public void setShow_number(Integer show_number) {
+		this.show_number = show_number;
+	}
+	public String getFilm_requirement() {
+		return film_requirement;
+	}
+	public void setFilm_requirement(String film_requirement) {
+		this.film_requirement = film_requirement;
+	}
+	public String getCopy_options() {
+		return copy_options;
+	}
+	public void setCopy_options(String copy_options) {
+		this.copy_options = copy_options;
+	}
 	
 }