x

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

@@ -42,7 +42,7 @@ public interface ReviewService {
 			Integer opt_state, 
 			Page page);
 	
-	List<Map<String, Object>> queryNewAsianRoundList(String keyword, Integer review_state, Integer review_round, String ext_type, Page page);
+	List<Map<String, Object>> queryNewAsianRoundList(String keyword, Integer user_group_id, Integer review_state, Integer review_round, String ext_type, Page page);
 	
 	/**
 	 * 查询评委审片列表

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

@@ -130,7 +130,7 @@ public class ReviewServiceImpl implements ReviewService {
 	}
 	
 	@Override
-	public List<Map<String, Object>> queryNewAsianRoundList(String keyword, Integer review_state, Integer review_round, String ext_type, Page page) {
+	public List<Map<String, Object>> queryNewAsianRoundList(String keyword, Integer user_group_id, Integer review_state, Integer review_round, String ext_type, Page page) {
 		XRException.assertNotBlank("获奖类型不能未空", ext_type);
 		XRException.assertNotBlank("选片轮数不能为空", review_round);
 		if(review_round.intValue() == 3) {

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

@@ -107,7 +107,8 @@ public class AdminReviewController {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-		List<Map<String, Object>> list = reviewService.queryNewAsianRoundList(keyword, review_state, review_round, ext_type, page);
+		
+		List<Map<String, Object>> list = null;//reviewService.queryNewAsianRoundList(keyword, review_state, review_round, ext_type, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	} 
 	
@@ -175,9 +176,11 @@ public class AdminReviewController {
 		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "review_text_3", value="评语3"),
 		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "review_text_4", value="评语4"),
 		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, allowMultiple=true, name = "ext_title", value="获奖标题  例如: 最佳男演员-张三"),
-		@ApiImplicitParam(paramType = "query", dataType = "double", required = false, allowMultiple=true, name = "ext_score", value="奖项得分"),
+		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, allowMultiple=true, name = "ext_type", value="评奖类型"),
+		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, allowMultiple=true, name = "ext_name", value="评奖主体名称"),
+		@ApiImplicitParam(paramType = "query", dataType = "double", required = false, allowMultiple=true, name = "ext_score", value="评奖得分"),
 	})
-	public Object saveReviewRecord(Integer record_id, Integer review_state, Double review_score, String review_text, String review_text_1, String review_text_2, String review_text_3, String review_text_4, String[] ext_title, Double[] ext_score) {
+	public Object saveReviewRecord(Integer record_id, Integer review_state, Double review_score, String review_text, String review_text_1, String review_text_2, String review_text_3, String review_text_4, String[] ext_title, String[] ext_type, String[] ext_name, Double[] ext_score) {
 		Map<String, Object> recordMap = reviewService.queryReviewRecordMapById(record_id);
 		Fc_review_record ru = Util.mapTo(recordMap, Fc_review_record.class);
 		ru.setReview_score(review_score);
@@ -195,6 +198,8 @@ public class AdminReviewController {
 					ext.setRecord_id(ru.getId());
 					ext.setExt_title(ext_title[i]);
 					ext.setExt_score(ext_score[i]);
+					ext.setExt_type(ext_type[i]);
+					ext.setExt_name(ext_name[i]);
 					exts.add(ext);
 				}
 			} else {