x

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

@@ -514,8 +514,7 @@ public class FilmServiceImpl implements FilmService {
 				Fc_review_user ru = new Fc_review_user();
 				ru.setReview_id(review.getId());
 				ru.setUser_id(i);
-				ru.setUser_view_state(0);
-				ru.setUser_review_state(0);
+				ru.setView_state(0);
 			}
 			jdbcTemplate.batchSave(list);
 		}

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

-package com.egolm.film.bean;
-
-import javax.persistence.Entity;
-
-import javax.persistence.Id;
-
-/**
- * @author 曲欣亮
- */
-@Entity(name="fc_review_result")
-public class Fc_review_result implements java.io.Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	private Integer id;
-
-	/**
-	 * 总审片记录ID
-	 */
-	private Integer review_id;
-
-	/**
-	 * 审片评委ID
-	 */
-	private Integer user_id;
-
-	/**
-	 * 2通过,3否决,4参赛,5参赛备选,6参展
-	 */
-	private Integer review_state;
-
-	/**
-	 * 得分分数
-	 */
-	private Double review_score;
-
-	/**
-	 * 影片评论
-	 */
-	private String review_text;
-
-	/**
-	 * 影片概述
-	 */
-	private String review_text_summary;
-
-	/**
-	 * 叙事/题材
-	 */
-	private String review_text_theme;
-
-	/**
-	 * 风格/美学
-	 */
-	private String review_text_style;
-
-	/**
-	 * 突出/优缺点
-	 */
-	private String review_text_keynote;
-
-
-	/**
-	 * 无参数构造方法
-	 */
-	public Fc_review_result () {
-		super();
-	}
-
-	/**
-	 * 全参数构造方法
-	 * @param id 
-	 * @param review_id 总审片记录ID
-	 * @param user_id 审片评委ID
-	 * @param review_state 2通过,3否决,4参赛,5参赛备选,6参展
-	 * @param review_score 得分分数
-	 * @param review_text 影片评论
-	 * @param review_text_summary 影片概述
-	 * @param review_text_theme 叙事/题材
-	 * @param review_text_style 风格/美学
-	 * @param review_text_keynote 突出/优缺点
-	 */
-	public Fc_review_result(Integer id, Integer review_id, Integer user_id, Integer review_state, Double review_score, String review_text, String review_text_summary, String review_text_theme, String review_text_style, String review_text_keynote) {
-		this.id = id;
-		this.review_id = review_id;
-		this.user_id = user_id;
-		this.review_state = review_state;
-		this.review_score = review_score;
-		this.review_text = review_text;
-		this.review_text_summary = review_text_summary;
-		this.review_text_theme = review_text_theme;
-		this.review_text_style = review_text_style;
-		this.review_text_keynote = review_text_keynote;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Integer getId() {
-		return 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;
-	}
-
-	public void setReview_state(Integer review_state) {
-		this.review_state = review_state;
-	}
-
-	public Integer getReview_state() {
-		return review_state;
-	}
-
-	public void setReview_score(Double review_score) {
-		this.review_score = review_score;
-	}
-
-	public Double getReview_score() {
-		return review_score;
-	}
-
-	public void setReview_text(String review_text) {
-		this.review_text = review_text;
-	}
-
-	public String getReview_text() {
-		return review_text;
-	}
-
-	public void setReview_text_summary(String review_text_summary) {
-		this.review_text_summary = review_text_summary;
-	}
-
-	public String getReview_text_summary() {
-		return review_text_summary;
-	}
-
-	public void setReview_text_theme(String review_text_theme) {
-		this.review_text_theme = review_text_theme;
-	}
-
-	public String getReview_text_theme() {
-		return review_text_theme;
-	}
-
-	public void setReview_text_style(String review_text_style) {
-		this.review_text_style = review_text_style;
-	}
-
-	public String getReview_text_style() {
-		return review_text_style;
-	}
-
-	public void setReview_text_keynote(String review_text_keynote) {
-		this.review_text_keynote = review_text_keynote;
-	}
-
-	public String getReview_text_keynote() {
-		return review_text_keynote;
-	}
-
-}
-

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

@@ -28,12 +28,42 @@ public class Fc_review_user implements java.io.Serializable {
 	/**
 	 * 0未观看,1已观看
 	 */
-	private Integer user_view_state;
+	private Integer view_state;
 
 	/**
-	 * 0未审片,1暂存,2已提交
+	 * 2通过,3否决,4参赛,5参赛备选,6参展
 	 */
-	private Integer user_review_state;
+	private Integer review_state;
+
+	/**
+	 * 得分分数
+	 */
+	private Double review_score;
+
+	/**
+	 * 影片评论
+	 */
+	private String review_text;
+
+	/**
+	 * 影片概述
+	 */
+	private String review_text_summary;
+
+	/**
+	 * 叙事/题材
+	 */
+	private String review_text_theme;
+
+	/**
+	 * 风格/美学
+	 */
+	private String review_text_style;
+
+	/**
+	 * 突出/优缺点
+	 */
+	private String review_text_keynote;
 
 
 	/**
@@ -48,15 +78,27 @@ public class Fc_review_user implements java.io.Serializable {
 	 * @param id 
 	 * @param review_id 审片记录ID
 	 * @param user_id 评委ID
-	 * @param user_view_state 0未观看,1已观看
-	 * @param user_review_state 0未审片,1暂存,2已提交
+	 * @param view_state 0未观看,1已观看
+	 * @param review_state 2通过,3否决,4参赛,5参赛备选,6参展
+	 * @param review_score 得分分数
+	 * @param review_text 影片评论
+	 * @param review_text_summary 影片概述
+	 * @param review_text_theme 叙事/题材
+	 * @param review_text_style 风格/美学
+	 * @param review_text_keynote 突出/优缺点
 	 */
-	public Fc_review_user(Integer id, Integer review_id, Integer user_id, Integer user_view_state, Integer user_review_state) {
+	public Fc_review_user(Integer id, Integer review_id, Integer user_id, Integer view_state, Integer review_state, Double review_score, String review_text, String review_text_summary, String review_text_theme, String review_text_style, String review_text_keynote) {
 		this.id = id;
 		this.review_id = review_id;
 		this.user_id = user_id;
-		this.user_view_state = user_view_state;
-		this.user_review_state = user_review_state;
+		this.view_state = view_state;
+		this.review_state = review_state;
+		this.review_score = review_score;
+		this.review_text = review_text;
+		this.review_text_summary = review_text_summary;
+		this.review_text_theme = review_text_theme;
+		this.review_text_style = review_text_style;
+		this.review_text_keynote = review_text_keynote;
 	}
 
 	public void setId(Integer id) {
@@ -83,20 +125,68 @@ public class Fc_review_user implements java.io.Serializable {
 		return user_id;
 	}
 
-	public void setUser_view_state(Integer user_view_state) {
-		this.user_view_state = user_view_state;
+	public void setView_state(Integer view_state) {
+		this.view_state = view_state;
+	}
+
+	public Integer getView_state() {
+		return view_state;
+	}
+
+	public void setReview_state(Integer review_state) {
+		this.review_state = review_state;
+	}
+
+	public Integer getReview_state() {
+		return review_state;
+	}
+
+	public void setReview_score(Double review_score) {
+		this.review_score = review_score;
+	}
+
+	public Double getReview_score() {
+		return review_score;
+	}
+
+	public void setReview_text(String review_text) {
+		this.review_text = review_text;
+	}
+
+	public String getReview_text() {
+		return review_text;
+	}
+
+	public void setReview_text_summary(String review_text_summary) {
+		this.review_text_summary = review_text_summary;
+	}
+
+	public String getReview_text_summary() {
+		return review_text_summary;
+	}
+
+	public void setReview_text_theme(String review_text_theme) {
+		this.review_text_theme = review_text_theme;
+	}
+
+	public String getReview_text_theme() {
+		return review_text_theme;
+	}
+
+	public void setReview_text_style(String review_text_style) {
+		this.review_text_style = review_text_style;
 	}
 
-	public Integer getUser_view_state() {
-		return user_view_state;
+	public String getReview_text_style() {
+		return review_text_style;
 	}
 
-	public void setUser_review_state(Integer user_review_state) {
-		this.user_review_state = user_review_state;
+	public void setReview_text_keynote(String review_text_keynote) {
+		this.review_text_keynote = review_text_keynote;
 	}
 
-	public Integer getUser_review_state() {
-		return user_review_state;
+	public String getReview_text_keynote() {
+		return review_text_keynote;
 	}
 
 }

src/main/java/com/egolm/film/bean/Fc_review_result_ext.java → src/main/java/com/egolm/film/bean/Fc_review_user_ext.java

@@ -7,8 +7,8 @@ import javax.persistence.Id;
 /**
  * @author 曲欣亮
  */
-@Entity(name="fc_review_result_ext")
-public class Fc_review_result_ext implements java.io.Serializable {
+@Entity(name="fc_review_user_ext")
+public class Fc_review_user_ext implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -44,7 +44,7 @@ public class Fc_review_result_ext implements java.io.Serializable {
 	/**
 	 * 无参数构造方法
 	 */
-	public Fc_review_result_ext () {
+	public Fc_review_user_ext () {
 		super();
 	}
 
@@ -57,7 +57,7 @@ public class Fc_review_result_ext implements java.io.Serializable {
 	 * @param enroll_ext_score 影片申报奖项评分
 	 * @param review_text 评委审片结论
 	 */
-	public Fc_review_result_ext(Integer id, Integer review_id, Integer user_id, Integer enroll_ext_id, Double enroll_ext_score, String review_text) {
+	public Fc_review_user_ext(Integer id, Integer review_id, Integer user_id, Integer enroll_ext_id, Double enroll_ext_score, String review_text) {
 		this.id = id;
 		this.review_id = review_id;
 		this.user_id = user_id;