x

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

@@ -136,4 +136,6 @@ public interface ReviewService {
 	boolean isBeginReview(Long film_id);
 
 	Map<String, Object> queryFilmReport(Integer user_id);
+	
+	Fc_review_record queryReviewRecord(Integer record_id);
 }
\ No newline at end of file

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

@@ -235,7 +235,9 @@ public class ExportServiceImpl implements ExportService {
 				map.put("enroll_type_name_other", StringUtil.join(",", others));
 			}
 			
-			Integer review_id = ((Number)map.get("review_id")).intValue();
+			Object obj_review_id = map.get("review_id");
+			if(obj_review_id != null) {
+				Integer review_id = ((Number)obj_review_id).intValue();
 				for(int i = 1; i <= 6 && i <= reviewRound; i++) {
 					StringBuffer sb = new StringBuffer();
 					List<Map<String, Object>> recordList = recordML.get(review_id + "," + i);
@@ -284,6 +286,7 @@ public class ExportServiceImpl implements ExportService {
 					map.put("round_" + i + "_text", sb.toString());
 				}
 			}
+		}	
 		
 		Map<String, String> columnMap = this.getApplyPassListColumns();
 		List<String> titleList = new ArrayList<String>();

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

@@ -260,6 +260,11 @@ public class ReviewServiceImpl implements ReviewService {
 	@Override
 	@Transactional
 	public void saveReviewRecord(Fc_review_record ru, List<Fc_review_record_ext> exts) {
+		Fc_review review = this.queryReviewById(ru.getReview_id());
+		Fc_review_record record = this.queryReviewRecord(ru.getId());
+		if(!ru.getReview_state().equals(record.getReview_state()) && review.getReview_round().intValue() != ru.getReview_round().intValue()) {
+			throw new XRException("不能修改历史审片结论");
+		}
 		jdbcTemplate.update(ru);
 		jdbcTemplate.executeUpdate("update fc_review set review_time = now() where id = ?", ru.getReview_id());
 		if(exts != null && exts.size() > 0) {
@@ -268,6 +273,11 @@ public class ReviewServiceImpl implements ReviewService {
 		}
 	}
 
+	@Override
+	public Fc_review_record queryReviewRecord(Integer record_id) {
+		return jdbcTemplate.queryForBean("select * from fc_review_record where id = ?", Fc_review_record.class, record_id);
+	}
+
 	@Override
 	public List<Fc_review_record_ext> queryReviewRecordExtList(Integer record_id) {
 		return jdbcTemplate.queryForBeans("select * from fc_review_record_ext where record_id = ?", Fc_review_record_ext.class, record_id);