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

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

@@ -18,6 +18,7 @@ import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
 import com.egolm.film.api.service.FilmService;
 import com.egolm.film.api.service.ReviewService;
+import com.egolm.film.bean.Fc_member_film;
 import com.egolm.film.bean.Fc_member_film_enroll;
 import com.egolm.film.bean.Fc_review;
 import com.egolm.film.bean.Fc_review_doubtful;
@@ -409,6 +410,7 @@ public class ReviewServiceImpl implements ReviewService {
 		int round = review.getReview_round();
 		int enrollType = review.getEnroll_type_id();
 		if(enrollType == 2 && (round == 2 || round == 3)) {
+			Fc_member_film film = filmService.queryMemberFilmById(review.getFilm_id().longValue());
 			
 		}
 		//TODO 计算单个亚新影片得分

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

+package com.egolm.film.bean;
+
+import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
+import javax.persistence.Id;
+
+@Entity(name="fc_report_asia_new")
+public class Fc_report_asia_new implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(columnDefinition="int(11)")
+	private Integer id;
+
+	@Column(columnDefinition="int(11)")
+	private Integer review_id;
+
+	@Column(columnDefinition="int(11)")
+	private Integer review_round;
+
+	@Column(columnDefinition="int(11)")
+	private Integer user_group_id;
+
+	@Column(columnDefinition="int(11)")
+	private Integer film_id;
+
+	@Column(columnDefinition="varchar(255)")
+	private String cn_name;
+
+	@Column(columnDefinition="varchar(255)")
+	private String en_name;
+
+	@Column(columnDefinition="varchar(255)")
+	private String original_name;
+
+	@Column(columnDefinition="double(4,2)")
+	private Double item_actor;
+
+	@Column(columnDefinition="double(4,2)")
+	private Double item_actress;
+
+	@Column(columnDefinition="double(4,2)")
+	private Double item_director;
+
+	@Column(columnDefinition="double(4,2)")
+	private Double item_screenwriter;
+
+	@Column(columnDefinition="double(4,2)")
+	private Double item_photographer;
+
+	@Column(columnDefinition="varchar(255)")
+	private String item_actor_data;
+
+	@Column(columnDefinition="varchar(255)")
+	private String item_actress_data;
+
+	@Column(columnDefinition="varchar(255)")
+	private String item_director_data;
+
+	@Column(columnDefinition="varchar(255)")
+	private String item_screenwriter_data;
+
+	@Column(columnDefinition="varchar(255)")
+	private String item_photographer_data;
+
+
+	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 setReview_round(Integer review_round) {
+		this.review_round = review_round;
+	}
+
+	public Integer getReview_round() {
+		return review_round;
+	}
+
+	public void setUser_group_id(Integer user_group_id) {
+		this.user_group_id = user_group_id;
+	}
+
+	public Integer getUser_group_id() {
+		return user_group_id;
+	}
+
+	public void setFilm_id(Integer film_id) {
+		this.film_id = film_id;
+	}
+
+	public Integer getFilm_id() {
+		return film_id;
+	}
+
+	public void setCn_name(String cn_name) {
+		this.cn_name = cn_name;
+	}
+
+	public String getCn_name() {
+		return cn_name;
+	}
+
+	public void setEn_name(String en_name) {
+		this.en_name = en_name;
+	}
+
+	public String getEn_name() {
+		return en_name;
+	}
+
+	public void setOriginal_name(String original_name) {
+		this.original_name = original_name;
+	}
+
+	public String getOriginal_name() {
+		return original_name;
+	}
+
+	public void setItem_actor(Double item_actor) {
+		this.item_actor = item_actor;
+	}
+
+	public Double getItem_actor() {
+		return item_actor;
+	}
+
+	public void setItem_actress(Double item_actress) {
+		this.item_actress = item_actress;
+	}
+
+	public Double getItem_actress() {
+		return item_actress;
+	}
+
+	public void setItem_director(Double item_director) {
+		this.item_director = item_director;
+	}
+
+	public Double getItem_director() {
+		return item_director;
+	}
+
+	public void setItem_screenwriter(Double item_screenwriter) {
+		this.item_screenwriter = item_screenwriter;
+	}
+
+	public Double getItem_screenwriter() {
+		return item_screenwriter;
+	}
+
+	public void setItem_photographer(Double item_photographer) {
+		this.item_photographer = item_photographer;
+	}
+
+	public Double getItem_photographer() {
+		return item_photographer;
+	}
+
+	public void setItem_actor_data(String item_actor_data) {
+		this.item_actor_data = item_actor_data;
+	}
+
+	public String getItem_actor_data() {
+		return item_actor_data;
+	}
+
+	public void setItem_actress_data(String item_actress_data) {
+		this.item_actress_data = item_actress_data;
+	}
+
+	public String getItem_actress_data() {
+		return item_actress_data;
+	}
+
+	public void setItem_director_data(String item_director_data) {
+		this.item_director_data = item_director_data;
+	}
+
+	public String getItem_director_data() {
+		return item_director_data;
+	}
+
+	public void setItem_screenwriter_data(String item_screenwriter_data) {
+		this.item_screenwriter_data = item_screenwriter_data;
+	}
+
+	public String getItem_screenwriter_data() {
+		return item_screenwriter_data;
+	}
+
+	public void setItem_photographer_data(String item_photographer_data) {
+		this.item_photographer_data = item_photographer_data;
+	}
+
+	public String getItem_photographer_data() {
+		return item_photographer_data;
+	}
+
+}
+