x

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

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.egolm.common.jdbc.Page;
+import com.egolm.film.bean.Fc_review;
 import com.egolm.film.bean.Fc_review_doubtful;
 
 public interface ReviewService {
@@ -13,7 +14,7 @@ public interface ReviewService {
 	
 	List<Map<String, Object>> queryReviewList(boolean is_review, Integer user_id, Date push_date, Integer film_type_id, Integer enroll_type_id,	String keyword, Page page);
 
-	Integer queryReviewRound(Integer film_id, Integer enroll_type_id);
+	Fc_review queryReview(Integer film_id, Integer enroll_type_id);
 
 	void saveDoubtful(Fc_review_doubtful doubtful);
 

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

@@ -12,6 +12,7 @@ import com.egolm.common.StringUtil;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
 import com.egolm.film.api.service.ReviewService;
+import com.egolm.film.bean.Fc_review;
 import com.egolm.film.bean.Fc_review_doubtful;
 import com.egolm.film.util.SqlWhere;
 
@@ -64,9 +65,9 @@ public class ReviewServiceImpl implements ReviewService {
 	}
 
 	@Override
-	public Integer queryReviewRound(Integer film_id, Integer enroll_type_id) {
-		String sql = "select review_round from fc_review where film_id = ? and enroll_type_id = ?";
-		return jdbcTemplate.queryForInt(sql, film_id, enroll_type_id);
+	public Fc_review queryReview(Integer film_id, Integer enroll_type_id) {
+		String sql = "select * from fc_review where film_id = ? and enroll_type_id = ?";
+		return jdbcTemplate.queryForBean(sql, Fc_review.class, film_id, enroll_type_id);
 	}
 
 	@Override

src/main/java/com/egolm/film/api/web/user/UserReviewController.java

@@ -16,7 +16,6 @@ import com.egolm.common.jdbc.Page;
 import com.egolm.film.api.service.FilmService;
 import com.egolm.film.api.service.ReviewService;
 import com.egolm.film.api.service.UserTokenService;
-import com.egolm.film.bean.Fc_review;
 import com.egolm.film.bean.Fc_review_doubtful;
 import com.egolm.film.model.LoginToken;
 
@@ -65,23 +64,21 @@ public class UserReviewController {
 	@PostMapping("doubtful_save")
 	@ApiOperation("保存疑点记录")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType = "query", dataType = "int",    required = false, name = "film_id", value="影片ID"),
+		@ApiImplicitParam(paramType = "query", dataType = "int",    required = false, name = "review_id", value="审片ID"),
 		@ApiImplicitParam(paramType = "query", dataType = "int",    required = false, name = "enroll_type_id", value="申报奖项ID"),
 		@ApiImplicitParam(paramType = "query", dataType = "int",    required = false, name = "doubtful_type_id", value="疑点类型ID"),
 		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "doubtful_text", value="疑点描述"),
 		@ApiImplicitParam(paramType = "query", dataType = "date",   required = false, name = "play_time", value="播放时间{yyyy-MM-dd HH:mm:ss}"),
 	})
-	public Object saveDoubtful(Integer film_id, Integer enroll_type_id, Integer doubtful_type_id, String doubtful_text, @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")Date play_time) {
-		Integer review_round = service.queryReviewRound(film_id, enroll_type_id);
+	public Object saveDoubtful(Integer review_id, Integer doubtful_type_id, String doubtful_text, @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")Date play_time) {
 		LoginToken token = tokenService.getToken();
 		Integer user_id = (Integer)token.getId();
 		Fc_review_doubtful doubtful = new Fc_review_doubtful();
+		doubtful.setCreate_time(new Date());
+		doubtful.setDoubtful_text(doubtful_text);
 		doubtful.setDoubtful_type_id(doubtful_type_id);
-		doubtful.setEnroll_type_id(enroll_type_id);
-		doubtful.setFilm_id(film_id);
 		doubtful.setPlay_time(play_time);
-		doubtful.setReview_round(review_round);
-		doubtful.setDoubtful_text(doubtful_text);
+		doubtful.setReview_id(review_id);
 		doubtful.setUser_id(user_id);
 		service.saveDoubtful(doubtful);
 		return Rjx.jsonOk().setData(doubtful);

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

@@ -14,9 +14,6 @@ public class Fc_review implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 审片记录ID
-	 */
 	@Id
 	private Integer id;
 
@@ -40,11 +37,6 @@ public class Fc_review implements java.io.Serializable {
 	 */
 	private Integer review_state;
 
-	/**
-	 * 审片结论
-	 */
-	private String result_text;
-
 	private Date create_time;
 
 
@@ -57,21 +49,19 @@ public class Fc_review implements java.io.Serializable {
 
 	/**
 	 * 全参数构造方法
-	 * @param id 审片记录ID
+	 * @param id 
 	 * @param film_id 参审影片ID
 	 * @param enroll_type_id 影片性质(申报奖项)ID
 	 * @param review_round 审片轮数,第几轮审片
 	 * @param review_state 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
-	 * @param result_text 审片结论
 	 * @param create_time 
 	 */
-	public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer review_state, String result_text, Date create_time) {
+	public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer review_state, Date create_time) {
 		this.id = id;
 		this.film_id = film_id;
 		this.enroll_type_id = enroll_type_id;
 		this.review_round = review_round;
 		this.review_state = review_state;
-		this.result_text = result_text;
 		this.create_time = create_time;
 	}
 
@@ -115,14 +105,6 @@ public class Fc_review implements java.io.Serializable {
 		return review_state;
 	}
 
-	public void setResult_text(String result_text) {
-		this.result_text = result_text;
-	}
-
-	public String getResult_text() {
-		return result_text;
-	}
-
 	public void setCreate_time(Date create_time) {
 		this.create_time = create_time;
 	}

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

@@ -20,17 +20,7 @@ public class Fc_review_doubtful implements java.io.Serializable {
 	/**
 	 * 影片ID
 	 */
-	private Integer film_id;
-
-	/**
-	 * 影片性质
-	 */
-	private Integer enroll_type_id;
-
-	/**
-	 * 第几轮审核
-	 */
-	private Integer review_round;
+	private Integer review_id;
 
 	/**
 	 * 评委ID
@@ -65,20 +55,16 @@ public class Fc_review_doubtful implements java.io.Serializable {
 	/**
 	 * 全参数构造方法
 	 * @param id 
-	 * @param film_id 影片ID
-	 * @param enroll_type_id 影片性质
-	 * @param review_round 第几轮审核
+	 * @param review_id 影片ID
 	 * @param user_id 评委ID
 	 * @param doubtful_type_id 疑点类型
 	 * @param doubtful_text 疑点介绍
 	 * @param play_time 疑点时间
 	 * @param create_time 
 	 */
-	public Fc_review_doubtful(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer user_id, Integer doubtful_type_id, String doubtful_text, Date play_time, Date create_time) {
+	public Fc_review_doubtful(Integer id, Integer review_id, Integer user_id, Integer doubtful_type_id, String doubtful_text, Date play_time, Date create_time) {
 		this.id = id;
-		this.film_id = film_id;
-		this.enroll_type_id = enroll_type_id;
-		this.review_round = review_round;
+		this.review_id = review_id;
 		this.user_id = user_id;
 		this.doubtful_type_id = doubtful_type_id;
 		this.doubtful_text = doubtful_text;
@@ -94,28 +80,12 @@ public class Fc_review_doubtful implements java.io.Serializable {
 		return id;
 	}
 
-	public void setFilm_id(Integer film_id) {
-		this.film_id = film_id;
-	}
-
-	public Integer getFilm_id() {
-		return film_id;
-	}
-
-	public void setEnroll_type_id(Integer enroll_type_id) {
-		this.enroll_type_id = enroll_type_id;
-	}
-
-	public Integer getEnroll_type_id() {
-		return enroll_type_id;
-	}
-
-	public void setReview_round(Integer review_round) {
-		this.review_round = review_round;
+	public void setReview_id(Integer review_id) {
+		this.review_id = review_id;
 	}
 
-	public Integer getReview_round() {
-		return review_round;
+	public Integer getReview_id() {
+		return review_id;
 	}
 
 	public void setUser_id(Integer user_id) {

src/main/java/com/egolm/film/bean/Fc_review_round.java → src/main/java/com/egolm/film/bean/Fc_review_list.java

@@ -4,65 +4,71 @@ import javax.persistence.Entity;
 
 import javax.persistence.Id;
 
+import java.util.Date;
+
 /**
  * @author 曲欣亮
  */
-@Entity(name="fc_review_round")
-public class Fc_review_round implements java.io.Serializable {
+@Entity(name="fc_review_list")
+public class Fc_review_list implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 参审影片ID
-	 */
 	@Id
-	private Integer film_id;
+	private Integer id;
 
-	/**
-	 * 影片性质(申报奖项)ID
-	 */
-	@Id
-	private Integer enroll_type_id;
+	private Integer review_id;
 
 	/**
 	 * 审片轮数,第几轮审片
 	 */
 	private Integer review_round;
 
+	/**
+	 * 审片结论
+	 */
+	private String review_text;
+
+	private Date create_time;
+
 
 	/**
 	 * 无参数构造方法
 	 */
-	public Fc_review_round () {
+	public Fc_review_list () {
 		super();
 	}
 
 	/**
 	 * 全参数构造方法
-	 * @param film_id 参审影片ID
-	 * @param enroll_type_id 影片性质(申报奖项)ID
+	 * @param id 
+	 * @param review_id 
 	 * @param review_round 审片轮数,第几轮审片
+	 * @param review_text 审片结论
+	 * @param create_time 
 	 */
-	public Fc_review_round(Integer film_id, Integer enroll_type_id, Integer review_round) {
-		this.film_id = film_id;
-		this.enroll_type_id = enroll_type_id;
+	public Fc_review_list(Integer id, Integer review_id, Integer review_round, String review_text, Date create_time) {
+		this.id = id;
+		this.review_id = review_id;
 		this.review_round = review_round;
+		this.review_text = review_text;
+		this.create_time = create_time;
 	}
 
-	public void setFilm_id(Integer film_id) {
-		this.film_id = film_id;
+	public void setId(Integer id) {
+		this.id = id;
 	}
 
-	public Integer getFilm_id() {
-		return film_id;
+	public Integer getId() {
+		return id;
 	}
 
-	public void setEnroll_type_id(Integer enroll_type_id) {
-		this.enroll_type_id = enroll_type_id;
+	public void setReview_id(Integer review_id) {
+		this.review_id = review_id;
 	}
 
-	public Integer getEnroll_type_id() {
-		return enroll_type_id;
+	public Integer getReview_id() {
+		return review_id;
 	}
 
 	public void setReview_round(Integer review_round) {
@@ -73,5 +79,21 @@ public class Fc_review_round implements java.io.Serializable {
 		return review_round;
 	}
 
+	public void setReview_text(String review_text) {
+		this.review_text = review_text;
+	}
+
+	public String getReview_text() {
+		return review_text;
+	}
+
+	public void setCreate_time(Date create_time) {
+		this.create_time = create_time;
+	}
+
+	public Date getCreate_time() {
+		return create_time;
+	}
+
 }
 

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

@@ -12,11 +12,14 @@ public class Fc_review_user implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 影片ID
+	 */
 	@Id
 	private Integer id;
 
 	/**
-	 * 审片记录ID
+	 * 评选轮数
 	 */
 	private Integer review_id;
 
@@ -75,8 +78,8 @@ public class Fc_review_user implements java.io.Serializable {
 
 	/**
 	 * 全参数构造方法
-	 * @param id 
-	 * @param review_id 审片记录ID
+	 * @param id 影片ID
+	 * @param review_id 评选轮数
 	 * @param user_id 评委ID
 	 * @param view_state 0未观看,1已观看
 	 * @param review_state 2通过,3否决,4参赛,5参赛备选,6参展

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

@@ -12,17 +12,22 @@ public class Fc_review_user_ext implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 影片ID
+	 */
 	@Id
 	private Integer id;
 
 	/**
-	 * 总审片记录ID
+	 * 影片性质
 	 */
+	@Id
 	private Integer review_id;
 
 	/**
 	 * 评委ID
 	 */
+	@Id
 	private Integer user_id;
 
 	/**
@@ -50,8 +55,8 @@ public class Fc_review_user_ext implements java.io.Serializable {
 
 	/**
 	 * 全参数构造方法
-	 * @param id 
-	 * @param review_id 总审片记录ID
+	 * @param id 影片ID
+	 * @param review_id 影片性质
 	 * @param user_id 评委ID
 	 * @param enroll_ext_id 影片申报奖项ID
 	 * @param enroll_ext_score 影片申报奖项评分