x

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

@@ -400,8 +400,8 @@ public class FilmServiceImpl implements FilmService {
 
 	@Override
 	public void pass(Long member_film_id) {
-		String sql = "update fc_member_film set apply_state = ? where id = ?";
-		jdbcTemplate.executeUpdate(sql, 2, member_film_id);
+		String sql = "update fc_member_film set apply_state = ?, pass_time = ? where id = ?";
+		jdbcTemplate.executeUpdate(sql, 2, System.currentTimeMillis()/1000L, member_film_id);
 	}
 
 	@Override

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

@@ -85,9 +85,14 @@ public class AdminFirstController {
 	@PostMapping("pass")
 	@ApiOperation("初审通过")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="long", required=false, name="member_film_id", value="申报影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id", value="申报影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_type_ext", value="申报影片ID"),
 	})
-	public Object pass(Long member_film_id) {
+	public Object pass(Long member_film_id, String film_type_name_short) {
+		memberFilmService.pass(member_film_id);
+		Fc_member_film film = new Fc_member_film();
+		film.setId(member_film_id);
+		film.setFilm_type_name_short(film_type_name_short);
 		memberFilmService.pass(member_film_id);
 		return Rjx.jsonOk();
 	}
@@ -96,7 +101,7 @@ public class AdminFirstController {
 	@PostMapping("reject")
 	@ApiOperation("初审拒绝")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="long", required=false, name="member_film_id", value="申报影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="long", required=true, name="member_film_id", value="申报影片ID"),
 	})
 	public Object reject(Long member_film_id) {
 		memberFilmService.reject(member_film_id);

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin")
 public class Fc_admin implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_group")
 public class Fc_admin_group implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_group_filmtype")
 public class Fc_admin_group_filmtype implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_group_menu")
 public class Fc_admin_group_menu implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_menu")
 public class Fc_admin_menu implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_enroll_type")
 public class Fc_enroll_type implements java.io.Serializable {

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

-package com.egolm.film.bean;
-
-import javax.persistence.Entity;
-
-import javax.persistence.Id;
-
-import java.util.Date;
-
-/**
- * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
- */
-@Entity(name="fc_film")
-public class Fc_film implements java.io.Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	private Integer film_id;
-
-	/**
-	 * 原片名
-	 */
-	private String origion_name;
-
-	/**
-	 * 英文名称
-	 */
-	private String en_name;
-
-	/**
-	 * 中文片名
-	 */
-	private String cn_name;
-
-	/**
-	 * 类型  1 电影 2电视
-	 */
-	private Integer type;
-
-	/**
-	 * 影片类型
-	 */
-	private Integer film_type_id;
-
-	/**
-	 * 放映时间
-	 */
-	private String show_date;
-
-	/**
-	 * 上映时间
-	 */
-	private Long show_time;
-
-	/**
-	 * 影片介质
-	 */
-	private String film_medium;
-
-	/**
-	 * 影片在线存储地址
-	 */
-	private String film_online_address;
-
-	/**
-	 * 影片在线存储密码
-	 */
-	private String film_online_password;
-
-	/**
-	 * 完成日期
-	 */
-	private String completion_date;
-
-	/**
-	 * 制片国
-	 */
-	private String film_country;
-
-	/**
-	 * 合拍国
-	 */
-	private String co_production_country;
-
-	/**
-	 * 制片人
-	 */
-	private String film_producers;
-
-	/**
-	 * 制片公司
-	 */
-	private String production_company;
-
-	/**
-	 * 是否愿意参展
-	 */
-	private Integer is_like_show;
-
-	/**
-	 * 首映地
-	 */
-	private String first_play_address;
-
-	/**
-	 * 影片总时长
-	 */
-	private String film_file_time;
-
-	/**
-	 * 颜色标签
-	 */
-	private String color_tag;
-
-	/**
-	 * 该片已参加过的电影节及所获奖项
-	 */
-	private String prize;
-
-	/**
-	 * 对白语言
-	 */
-	private String dialogue_lang;
-
-	/**
-	 * 字幕语言
-	 */
-	private String subtitle_lang;
-
-	/**
-	 * 该片在上海电影节放映是
-	 */
-	private String play_shanghai;
-
-	/**
-	 * 影片简介
-	 */
-	private String intro;
-
-	/**
-	 * 影片简介英文
-	 */
-	private String en_intro;
-
-	/**
-	 * 状态 0正常 1关闭 2删除
-	 */
-	private Integer state;
-
-	/**
-	 * 影片时长
-	 */
-	private String film_total_time;
-
-	/**
-	 * 当前审核环节
-	 */
-	private Integer round;
-
-	/**
-	 * 管理员id
-	 */
-	private Integer adminid;
-
-	/**
-	 * 添加时间
-	 */
-	private Date create_time;
-
-	/**
-	 * 最后更新时间
-	 */
-	private Date last_update_time;
-
-
-	/**
-	 * 无参数构造方法
-	 */
-	public Fc_film () {
-		super();
-	}
-
-	/**
-	 * 全参数构造方法
-	 * @param film_id 
-	 * @param origion_name 原片名
-	 * @param en_name 英文名称
-	 * @param cn_name 中文片名
-	 * @param type 类型  1 电影 2电视
-	 * @param film_type_id 影片类型
-	 * @param show_date 放映时间
-	 * @param show_time 上映时间
-	 * @param film_medium 影片介质
-	 * @param film_online_address 影片在线存储地址
-	 * @param film_online_password 影片在线存储密码
-	 * @param completion_date 完成日期
-	 * @param film_country 制片国
-	 * @param co_production_country 合拍国
-	 * @param film_producers 制片人
-	 * @param production_company 制片公司
-	 * @param is_like_show 是否愿意参展
-	 * @param first_play_address 首映地
-	 * @param film_file_time 影片总时长
-	 * @param color_tag 颜色标签
-	 * @param prize 该片已参加过的电影节及所获奖项
-	 * @param dialogue_lang 对白语言
-	 * @param subtitle_lang 字幕语言
-	 * @param play_shanghai 该片在上海电影节放映是
-	 * @param intro 影片简介
-	 * @param en_intro 影片简介英文
-	 * @param state 状态 0正常 1关闭 2删除
-	 * @param film_total_time 影片时长
-	 * @param round 当前审核环节
-	 * @param adminid 管理员id
-	 * @param create_time 添加时间
-	 * @param last_update_time 最后更新时间
-	 */
-	public Fc_film(Integer film_id, String origion_name, String en_name, String cn_name, Integer type, Integer film_type_id, String show_date, Long show_time, String film_medium, String film_online_address, String film_online_password, String completion_date, String film_country, String co_production_country, String film_producers, String production_company, Integer is_like_show, String first_play_address, String film_file_time, String color_tag, String prize, String dialogue_lang, String subtitle_lang, String play_shanghai, String intro, String en_intro, Integer state, String film_total_time, Integer round, Integer adminid, Date create_time, Date last_update_time) {
-		this.film_id = film_id;
-		this.origion_name = origion_name;
-		this.en_name = en_name;
-		this.cn_name = cn_name;
-		this.type = type;
-		this.film_type_id = film_type_id;
-		this.show_date = show_date;
-		this.show_time = show_time;
-		this.film_medium = film_medium;
-		this.film_online_address = film_online_address;
-		this.film_online_password = film_online_password;
-		this.completion_date = completion_date;
-		this.film_country = film_country;
-		this.co_production_country = co_production_country;
-		this.film_producers = film_producers;
-		this.production_company = production_company;
-		this.is_like_show = is_like_show;
-		this.first_play_address = first_play_address;
-		this.film_file_time = film_file_time;
-		this.color_tag = color_tag;
-		this.prize = prize;
-		this.dialogue_lang = dialogue_lang;
-		this.subtitle_lang = subtitle_lang;
-		this.play_shanghai = play_shanghai;
-		this.intro = intro;
-		this.en_intro = en_intro;
-		this.state = state;
-		this.film_total_time = film_total_time;
-		this.round = round;
-		this.adminid = adminid;
-		this.create_time = create_time;
-		this.last_update_time = last_update_time;
-	}
-
-	public void setFilm_id(Integer film_id) {
-		this.film_id = film_id;
-	}
-
-	public Integer getFilm_id() {
-		return film_id;
-	}
-
-	public void setOrigion_name(String origion_name) {
-		this.origion_name = origion_name;
-	}
-
-	public String getOrigion_name() {
-		return origion_name;
-	}
-
-	public void setEn_name(String en_name) {
-		this.en_name = en_name;
-	}
-
-	public String getEn_name() {
-		return en_name;
-	}
-
-	public void setCn_name(String cn_name) {
-		this.cn_name = cn_name;
-	}
-
-	public String getCn_name() {
-		return cn_name;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	public Integer getType() {
-		return type;
-	}
-
-	public void setFilm_type_id(Integer film_type_id) {
-		this.film_type_id = film_type_id;
-	}
-
-	public Integer getFilm_type_id() {
-		return film_type_id;
-	}
-
-	public void setShow_date(String show_date) {
-		this.show_date = show_date;
-	}
-
-	public String getShow_date() {
-		return show_date;
-	}
-
-	public void setShow_time(Long show_time) {
-		this.show_time = show_time;
-	}
-
-	public Long getShow_time() {
-		return show_time;
-	}
-
-	public void setFilm_medium(String film_medium) {
-		this.film_medium = film_medium;
-	}
-
-	public String getFilm_medium() {
-		return film_medium;
-	}
-
-	public void setFilm_online_address(String film_online_address) {
-		this.film_online_address = film_online_address;
-	}
-
-	public String getFilm_online_address() {
-		return film_online_address;
-	}
-
-	public void setFilm_online_password(String film_online_password) {
-		this.film_online_password = film_online_password;
-	}
-
-	public String getFilm_online_password() {
-		return film_online_password;
-	}
-
-	public void setCompletion_date(String completion_date) {
-		this.completion_date = completion_date;
-	}
-
-	public String getCompletion_date() {
-		return completion_date;
-	}
-
-	public void setFilm_country(String film_country) {
-		this.film_country = film_country;
-	}
-
-	public String getFilm_country() {
-		return film_country;
-	}
-
-	public void setCo_production_country(String co_production_country) {
-		this.co_production_country = co_production_country;
-	}
-
-	public String getCo_production_country() {
-		return co_production_country;
-	}
-
-	public void setFilm_producers(String film_producers) {
-		this.film_producers = film_producers;
-	}
-
-	public String getFilm_producers() {
-		return film_producers;
-	}
-
-	public void setProduction_company(String production_company) {
-		this.production_company = production_company;
-	}
-
-	public String getProduction_company() {
-		return production_company;
-	}
-
-	public void setIs_like_show(Integer is_like_show) {
-		this.is_like_show = is_like_show;
-	}
-
-	public Integer getIs_like_show() {
-		return is_like_show;
-	}
-
-	public void setFirst_play_address(String first_play_address) {
-		this.first_play_address = first_play_address;
-	}
-
-	public String getFirst_play_address() {
-		return first_play_address;
-	}
-
-	public void setFilm_file_time(String film_file_time) {
-		this.film_file_time = film_file_time;
-	}
-
-	public String getFilm_file_time() {
-		return film_file_time;
-	}
-
-	public void setColor_tag(String color_tag) {
-		this.color_tag = color_tag;
-	}
-
-	public String getColor_tag() {
-		return color_tag;
-	}
-
-	public void setPrize(String prize) {
-		this.prize = prize;
-	}
-
-	public String getPrize() {
-		return prize;
-	}
-
-	public void setDialogue_lang(String dialogue_lang) {
-		this.dialogue_lang = dialogue_lang;
-	}
-
-	public String getDialogue_lang() {
-		return dialogue_lang;
-	}
-
-	public void setSubtitle_lang(String subtitle_lang) {
-		this.subtitle_lang = subtitle_lang;
-	}
-
-	public String getSubtitle_lang() {
-		return subtitle_lang;
-	}
-
-	public void setPlay_shanghai(String play_shanghai) {
-		this.play_shanghai = play_shanghai;
-	}
-
-	public String getPlay_shanghai() {
-		return play_shanghai;
-	}
-
-	public void setIntro(String intro) {
-		this.intro = intro;
-	}
-
-	public String getIntro() {
-		return intro;
-	}
-
-	public void setEn_intro(String en_intro) {
-		this.en_intro = en_intro;
-	}
-
-	public String getEn_intro() {
-		return en_intro;
-	}
-
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	public Integer getState() {
-		return state;
-	}
-
-	public void setFilm_total_time(String film_total_time) {
-		this.film_total_time = film_total_time;
-	}
-
-	public String getFilm_total_time() {
-		return film_total_time;
-	}
-
-	public void setRound(Integer round) {
-		this.round = round;
-	}
-
-	public Integer getRound() {
-		return round;
-	}
-
-	public void setAdminid(Integer adminid) {
-		this.adminid = adminid;
-	}
-
-	public Integer getAdminid() {
-		return adminid;
-	}
-
-	public void setCreate_time(Date create_time) {
-		this.create_time = create_time;
-	}
-
-	public Date getCreate_time() {
-		return create_time;
-	}
-
-	public void setLast_update_time(Date last_update_time) {
-		this.last_update_time = last_update_time;
-	}
-
-	public Date getLast_update_time() {
-		return last_update_time;
-	}
-
-}
-

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_film_enroll")
 public class Fc_film_enroll implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_film_type")
 public class Fc_film_type implements java.io.Serializable {

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

@@ -8,8 +8,6 @@ import java.util.Date;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_logs")
 public class Fc_logs implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_logs_ext")
 public class Fc_logs_ext implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member")
 public class Fc_member implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film")
 public class Fc_member_film implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_all")
 public class Fc_member_film_all implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_issuer")
 public class Fc_member_film_issuer implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_playactor")
 public class Fc_member_film_playactor implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_show")
 public class Fc_member_film_show implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_user")
 public class Fc_user implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_user_group")
 public class Fc_user_group implements java.io.Serializable {