x

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

@@ -18,6 +18,7 @@ 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.bean.Fc_review_record;
 import com.egolm.film.bean.Fc_review_record_ext;
@@ -108,11 +109,12 @@ public class UserReviewController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", dataType = "int",    required = false, name = "review_id", value="审片ID"),
 		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "doubtful_text", value="疑点描述", allowMultiple=true),
-		@ApiImplicitParam(paramType = "query", dataType = "date",   required = false, name = "play_time", value="播放时间{yyyy-MM-dd HH:mm:ss}"),
+		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "play_time", value="播放时间{HH:mm:ss}"),
 	})
-	public Object saveDoubtful(Integer review_id, String[] doubtful_text, @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")Date play_time) {
+	public Object saveDoubtful(Integer review_id, String[] doubtful_text, String play_time) {
 		LoginToken token = tokenService.getToken();
 		Integer user_id = (Integer)token.getId();
+		Fc_review review = service.queryReviewById(review_id);
 		List<Fc_review_doubtful> list = new ArrayList<Fc_review_doubtful>();
 		for(String text : doubtful_text) {
 			Fc_review_doubtful doubtful = new Fc_review_doubtful();
@@ -121,6 +123,7 @@ public class UserReviewController {
 			doubtful.setPlay_time(play_time);
 			doubtful.setReview_id(review_id);
 			doubtful.setUser_id(user_id);
+			doubtful.setReview_round(review.getReview_round());
 			list.add(doubtful);
 		}
 		service.saveDoubtfulList(list);

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

@@ -11,7 +11,7 @@ public class Fc_film_upload implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@Column(columnDefinition="varchar(255) COMMENT '阿里云视频ID'")
+	@Column(columnDefinition="varchar(255)")
 	private String id;
 
 	@Column(columnDefinition="int(11) COMMENT '影片ID'")
@@ -23,7 +23,7 @@ public class Fc_film_upload implements java.io.Serializable {
 	@Column(columnDefinition="int(11) COMMENT '集数'")
 	private Integer number;
 
-	@Column(columnDefinition="int(11) COMMENT '上传状态  0未上传, 1上传中, 2已上传'")
+	@Column(columnDefinition="int(11) COMMENT '上传状态'")
 	private Integer upload_state;
 
 	@Column(columnDefinition="varchar(255) COMMENT '剧集名'")
@@ -38,7 +38,7 @@ public class Fc_film_upload implements java.io.Serializable {
 	@Column(columnDefinition="datetime COMMENT '完成上传时间'")
 	private Date upload_time;
 
-	@Column(columnDefinition="varchar(36) COMMENT '上传进度'")
+	@Column(columnDefinition="varchar(32) COMMENT '上传进度'")
 	private String upload_progress;
 
 	@Column(columnDefinition="varchar(255) COMMENT '后台服务上传路径'")
@@ -47,7 +47,7 @@ public class Fc_film_upload implements java.io.Serializable {
 	@Column(columnDefinition="varchar(255) COMMENT '后台服务上传失败原因'")
 	private String upload__error_message;
 
-	@Column(columnDefinition="varchar(255) COMMENT '分配的任务名称'")
+	@Column(columnDefinition="varchar(64) COMMENT '后台服务上传任务名称'")
 	private String taskName;
 
 
@@ -156,4 +156,4 @@ public class Fc_film_upload implements java.io.Serializable {
 	}
 
 }
-
+

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

@@ -254,7 +254,7 @@ public class Fc_member_film implements java.io.Serializable {
 	@Column(columnDefinition="varchar(255) COMMENT '级别评定'")
 	private String level_text;
 
-	@Column(columnDefinition="varchar(255) COMMENT '终身归档评语'")
+	@Column(columnDefinition="varchar(255) COMMENT '终审归档评语'")
 	private String group_remark;
 
 

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

@@ -20,14 +20,17 @@ public class Fc_review_doubtful implements java.io.Serializable {
 	@Column(columnDefinition="int(11) COMMENT '影片ID'")
 	private Integer review_id;
 
+	@Column(columnDefinition="int(11) COMMENT '审片阶段'")
+	private Integer review_round;
+
 	@Column(columnDefinition="int(11) COMMENT '评委ID'")
 	private Integer user_id;
 
 	@Column(columnDefinition="text COMMENT '疑点介绍'")
 	private String doubtful_text;
 
-	@Column(columnDefinition="datetime COMMENT '疑点时间'")
-	private Date play_time;
+	@Column(columnDefinition="varchar(255) COMMENT '疑点时间'")
+	private String play_time;
 
 	@Column(columnDefinition="datetime COMMENT '疑点记录时间'")
 	private Date create_time;
@@ -49,6 +52,14 @@ public class Fc_review_doubtful implements java.io.Serializable {
 		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_id(Integer user_id) {
 		this.user_id = user_id;
 	}
@@ -65,11 +76,11 @@ public class Fc_review_doubtful implements java.io.Serializable {
 		return doubtful_text;
 	}
 
-	public void setPlay_time(Date play_time) {
+	public void setPlay_time(String play_time) {
 		this.play_time = play_time;
 	}
 
-	public Date getPlay_time() {
+	public String getPlay_time() {
 		return play_time;
 	}