x

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

@@ -112,5 +112,7 @@ public interface FilmService {
 	void mergeMemberFilm(Fc_member_film film);
 
 	void updateFilmBase(Fc_member_film_base_model filmBase);
+
+	void toNextRound(Long member_film_id);
 	
 }

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

@@ -31,6 +31,7 @@ import com.egolm.film.bean.Fc_member_film_enroll_ext;
 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;
+import com.egolm.film.bean.Fc_review;
 import com.egolm.film.bean.model.Fc_member_film_base_model;
 import com.egolm.film.config.WebMvcConfig;
 import com.egolm.film.config.XException;
@@ -490,4 +491,25 @@ public class FilmServiceImpl implements FilmService {
 		jdbcTemplate.update(filmBase);
 	}
 
+	@Override
+	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.getRound();
+		Integer nextRound = null;
+		if(round == null || round == 0) {
+			nextRound = 1;
+		} else {
+			nextRound = round + 1;
+		}
+		jdbcTemplate.executeUpdate("update fc_member_film set round = ? where id = ?", nextRound, member_film_id);
+		List<Fc_review> reviews = jdbcTemplate.queryForBeans("select * from fc_review where film_id = ? and round = ?", Fc_review.class, member_film_id, nextRound);
+		if(reviews == null || reviews.size() ==0) {
+			Fc_review review = new Fc_review();
+			review.setFilm_id(member_film_id.intValue());
+			review.setReview_round(nextRound);
+			review.setReview_state(0);
+			jdbcTemplate.save(review);
+		}
+	}
+
 }

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

@@ -108,6 +108,7 @@ 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);
 		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/AllotController.java

+package com.egolm.film.api.web.admin;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.egolm.common.bean.Rjx;
+import com.egolm.common.jdbc.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api
+@Controller
+@RequestMapping("admin/review")
+public class AllotController {
+
+	@ResponseBody
+	@PostMapping("list")
+	@ApiOperation("查询选片列表")
+	public Object list(String keyword, Integer film_type_name, Integer film_type_name_short, String film_country, Long index, Long limit) {
+		index = index == null ? 1 : index;
+		limit = limit == null ? 20 : limit;
+		Page page = new Page(index, limit);
+		
+		return Rjx.jsonOk();
+	} 
+	
+}

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

@@ -23,6 +23,11 @@ public class Enum_enroll implements java.io.Serializable {
 	 */
 	private String enroll_type_name;
 
+	/**
+	 * 上级ID
+	 */
+	private Integer parent_id;
+
 
 	/**
 	 * 无参数构造方法
@@ -35,10 +40,12 @@ public class Enum_enroll implements java.io.Serializable {
 	 * 全参数构造方法
 	 * @param enroll_type 影片性质ID
 	 * @param enroll_type_name 影片性质名称
+	 * @param parent_id 上级ID
 	 */
-	public Enum_enroll(Integer enroll_type, String enroll_type_name) {
+	public Enum_enroll(Integer enroll_type, String enroll_type_name, Integer parent_id) {
 		this.enroll_type = enroll_type;
 		this.enroll_type_name = enroll_type_name;
+		this.parent_id = parent_id;
 	}
 
 	public void setEnroll_type(Integer enroll_type) {
@@ -57,5 +64,13 @@ public class Enum_enroll implements java.io.Serializable {
 		return enroll_type_name;
 	}
 
+	public void setParent_id(Integer parent_id) {
+		this.parent_id = parent_id;
+	}
+
+	public Integer getParent_id() {
+		return parent_id;
+	}
+
 }
 

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

@@ -23,6 +23,11 @@ public class Enum_filmtype implements java.io.Serializable {
 	 */
 	private String film_type_name;
 
+	/**
+	 * 上级ID
+	 */
+	private Integer parent_id;
+
 
 	/**
 	 * 无参数构造方法
@@ -35,10 +40,12 @@ public class Enum_filmtype implements java.io.Serializable {
 	 * 全参数构造方法
 	 * @param film_type 影片类型ID
 	 * @param film_type_name 影片类型名称
+	 * @param parent_id 上级ID
 	 */
-	public Enum_filmtype(Integer film_type, String film_type_name) {
+	public Enum_filmtype(Integer film_type, String film_type_name, Integer parent_id) {
 		this.film_type = film_type;
 		this.film_type_name = film_type_name;
+		this.parent_id = parent_id;
 	}
 
 	public void setFilm_type(Integer film_type) {
@@ -57,5 +64,13 @@ public class Enum_filmtype implements java.io.Serializable {
 		return film_type_name;
 	}
 
+	public void setParent_id(Integer parent_id) {
+		this.parent_id = parent_id;
+	}
+
+	public Integer getParent_id() {
+		return parent_id;
+	}
+
 }
 

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

@@ -137,9 +137,5 @@ 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

@@ -155,11 +155,6 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private String create_ip;
 
-	/**
-	 * 状态
-	 */
-	private Integer state;
-
 	/**
 	 * 该片已参加过的电影节及所获奖项
 	 */
@@ -273,8 +268,18 @@ public class Fc_member_film implements java.io.Serializable {
 	/**
 	 * 状态
 	 */
+	private Integer state;
+
+	/**
+	 * 初审状态
+	 */
 	private Integer apply_state;
 
+	/**
+	 * 初审结论
+	 */
+	private String apply_state_intro;
+
 	/**
 	 * 区域
 	 */
@@ -290,6 +295,11 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private Long pass_time;
 
+	/**
+	 * 当前审片是第几轮
+	 */
+	private Integer round;
+
 
 	/**
 	 * 无参数构造方法
@@ -329,7 +339,6 @@ 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 字幕语言
@@ -352,12 +361,15 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param film_format_passw 样片url密码
 	 * @param film_format_other 样片url其他
 	 * @param lang 语言
-	 * @param apply_state 状态
+	 * @param state 状态
+	 * @param apply_state 初审状态
+	 * @param apply_state_intro 初审结论
 	 * @param film_district 区域
 	 * @param is_check_director 状态
 	 * @param pass_time 通过时间
+	 * @param 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, 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) {
+	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 round) {
 		this.id = id;
 		this.film_no = film_no;
 		this.origion_name = origion_name;
@@ -387,7 +399,6 @@ 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;
@@ -410,10 +421,13 @@ public class Fc_member_film implements java.io.Serializable {
 		this.film_format_passw = film_format_passw;
 		this.film_format_other = film_format_other;
 		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;
+		this.round = round;
 	}
 
 	public void setId(Long id) {
@@ -648,14 +662,6 @@ 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;
 	}
@@ -832,6 +838,14 @@ public class Fc_member_film implements java.io.Serializable {
 		return lang;
 	}
 
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
 	public void setApply_state(Integer apply_state) {
 		this.apply_state = apply_state;
 	}
@@ -840,6 +854,14 @@ 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;
 	}
@@ -864,5 +886,13 @@ public class Fc_member_film implements java.io.Serializable {
 		return pass_time;
 	}
 
+	public void setRound(Integer round) {
+		this.round = round;
+	}
+
+	public Integer getRound() {
+		return round;
+	}
+
 }
 

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

+package com.egolm.film.bean;
+
+import javax.persistence.Entity;
+
+import javax.persistence.Id;
+
+/**
+ * @author 曲欣亮
+ */
+@Entity(name="fc_review")
+public class Fc_review implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 审片记录ID
+	 */
+	@Id
+	private Integer id;
+
+	/**
+	 * 参审影片ID
+	 */
+	private Integer film_id;
+
+	/**
+	 * 审片状态 0未分配评委 1通过,2否决,3参赛,4参赛备选,5参展
+	 */
+	private Integer review_state;
+
+	/**
+	 * 审片轮数,第几轮审片
+	 */
+	private Integer review_round;
+
+	/**
+	 * 审片结论
+	 */
+	private String result_text;
+
+
+	/**
+	 * 无参数构造方法
+	 */
+	public Fc_review () {
+		super();
+	}
+
+	/**
+	 * 全参数构造方法
+	 * @param id 审片记录ID
+	 * @param film_id 参审影片ID
+	 * @param review_state 审片状态 0未分配评委 1通过,2否决,3参赛,4参赛备选,5参展
+	 * @param review_round 审片轮数,第几轮审片
+	 * @param result_text 审片结论
+	 */
+	public Fc_review(Integer id, Integer film_id, Integer review_state, Integer review_round, String result_text) {
+		this.id = id;
+		this.film_id = film_id;
+		this.review_state = review_state;
+		this.review_round = review_round;
+		this.result_text = result_text;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setFilm_id(Integer film_id) {
+		this.film_id = film_id;
+	}
+
+	public Integer getFilm_id() {
+		return film_id;
+	}
+
+	public void setReview_state(Integer review_state) {
+		this.review_state = review_state;
+	}
+
+	public Integer getReview_state() {
+		return review_state;
+	}
+
+	public void setReview_round(Integer review_round) {
+		this.review_round = review_round;
+	}
+
+	public Integer getReview_round() {
+		return review_round;
+	}
+
+	public void setResult_text(String result_text) {
+		this.result_text = result_text;
+	}
+
+	public String getResult_text() {
+		return result_text;
+	}
+
+}
+

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

+package com.egolm.film.bean;
+
+import javax.persistence.Entity;
+
+/**
+ * @author 曲欣亮
+ */
+@Entity(name="fc_review_user")
+public class Fc_review_user implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer review_id;
+
+	private Integer user_id;
+
+
+	/**
+	 * 无参数构造方法
+	 */
+	public Fc_review_user () {
+		super();
+	}
+
+	/**
+	 * 全参数构造方法
+	 * @param review_id 
+	 * @param user_id 
+	 */
+	public Fc_review_user(Integer review_id, Integer user_id) {
+		this.review_id = review_id;
+		this.user_id = user_id;
+	}
+
+	public void setReview_id(Integer review_id) {
+		this.review_id = review_id;
+	}
+
+	public Integer getReview_id() {
+		return review_id;
+	}
+
+	public void setUser_id(Integer user_id) {
+		this.user_id = user_id;
+	}
+
+	public Integer getUser_id() {
+		return user_id;
+	}
+
+}
+

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

+package com.egolm.film.bean;
+
+import javax.persistence.Entity;
+
+import javax.persistence.Id;
+
+/**
+ * @author 曲欣亮
+ */
+@Entity(name="fc_review_user_result")
+public class Fc_review_user_result implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	private Integer id;
+
+	private Integer user_id;
+
+	private Integer review_id;
+
+	private Integer review_state;
+
+	private String review_text;
+
+
+	/**
+	 * 无参数构造方法
+	 */
+	public Fc_review_user_result () {
+		super();
+	}
+
+	/**
+	 * 全参数构造方法
+	 * @param id 
+	 * @param user_id 
+	 * @param review_id 
+	 * @param review_state 
+	 * @param review_text 
+	 */
+	public Fc_review_user_result(Integer id, Integer user_id, Integer review_id, Integer review_state, String review_text) {
+		this.id = id;
+		this.user_id = user_id;
+		this.review_id = review_id;
+		this.review_state = review_state;
+		this.review_text = review_text;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setUser_id(Integer user_id) {
+		this.user_id = user_id;
+	}
+
+	public Integer getUser_id() {
+		return user_id;
+	}
+
+	public void setReview_id(Integer review_id) {
+		this.review_id = review_id;
+	}
+
+	public Integer getReview_id() {
+		return review_id;
+	}
+
+	public void setReview_state(Integer review_state) {
+		this.review_state = review_state;
+	}
+
+	public Integer getReview_state() {
+		return review_state;
+	}
+
+	public void setReview_text(String review_text) {
+		this.review_text = review_text;
+	}
+
+	public String getReview_text() {
+		return review_text;
+	}
+
+}
+