x

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

@@ -346,6 +346,9 @@ public class ReviewServiceImpl implements ReviewService {
 			review.setOpt_state(0);
 			review.setReview_state(null);
 			review.setCreate_time(now);
+			if(enroll_type_id == 4) {
+				review.setFrom_round(0);
+			}
 			jdbcTemplate.save(review);
 		} else {
 			throw new XRException("该影已存在审片流程");
@@ -404,6 +407,7 @@ public class ReviewServiceImpl implements ReviewService {
 	
 	private void transfer_4_flow_4(Fc_review review) {
 		Date now = new Date();
+		review.setFrom_round(review.getReview_round());
 		review.setEnroll_type_id(4);
 		review.setReview_round(4);
 		review.setPush_time(now);
@@ -416,6 +420,7 @@ public class ReviewServiceImpl implements ReviewService {
 	
 	private void transfer_4_flow_5(Fc_review review) {
 		Date now = new Date();
+		review.setFrom_round(review.getReview_round());
 		review.setEnroll_type_id(4);
 		review.setReview_round(5);
 		review.setPush_time(now);

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

@@ -142,6 +142,7 @@ public class WebUtilController {
 		this.verifyAuth();
 		jdbcTemplate.executeUpdate("delete from fc_review");
 		jdbcTemplate.executeUpdate("delete from fc_review_record");
+		jdbcTemplate.executeUpdate("delete from fc_review_history");
 		jdbcTemplate.executeUpdate("delete from fc_review_record_ext");
 		List<Fc_member_film> films = jdbcTemplate.queryForBeans("select * from fc_member_film where apply_state = 2", Fc_member_film.class);
 		for(Fc_member_film film : films) {

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

@@ -35,6 +35,9 @@ public class Fc_review implements java.io.Serializable {
 	@Column(columnDefinition="int(11) COMMENT '评选状态 0未评选 1有争议 2管理员分配 3审片完成'")
 	private Integer opt_state;
 
+	@Column(columnDefinition="int(11) COMMENT '0原始 2二选 3三选'")
+	private Integer from_round;
+
 	@Column(columnDefinition="datetime COMMENT '推送时间'")
 	private Date push_time;
 
@@ -101,6 +104,14 @@ public class Fc_review implements java.io.Serializable {
 		return opt_state;
 	}
 
+	public void setFrom_round(Integer from_round) {
+		this.from_round = from_round;
+	}
+
+	public Integer getFrom_round() {
+		return from_round;
+	}
+
 	public void setPush_time(Date push_time) {
 		this.push_time = push_time;
 	}