xx

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

@@ -529,7 +529,7 @@ public class FilmServiceImpl implements FilmService {
 				.eq("mf.film_country", film_country)
 				.in("mf.review_round", review_round);
 				;
-		String sql = "select mf.*, r.review_state, r.result_text, (select GROUP_CONCAT(mfd.playactor_name) from fc_member_film_playactor mfd where mfd.film_id = mf.id and mfd.playactor_type = 'director') director_name from fc_member_film mf left join fc_review r on r.film_id = mf.id and r.review_round = mf.review_round" + StringUtil.join(" and ", " where ", "", "", w1.getStringList());
+		String sql = "select mf.id, mf.review_round, mf.original_name, mf.en_name, mf.cn_name, mf.film_type_name, r.review_state, r.result_text, (select GROUP_CONCAT(mfd.playactor_name) from fc_member_film_playactor mfd where mfd.film_id = mf.id and mfd.playactor_type = 'director') director_name from fc_member_film mf left join fc_review r on r.film_id = mf.id and r.review_round = mf.review_round" + StringUtil.join(" and ", " where ", "", "", w1.getStringList());
 		if(enroll_type_id != null) {
 			sql = "select t.* from (" + sql + ") t, fc_member_film_enroll mfe where t.id = mfe.film_id and mfe.enroll_type_id = " + enroll_type_id;
 		} 

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

@@ -14,6 +14,8 @@ import com.egolm.common.jdbc.Page;
 import com.egolm.film.api.service.FilmService;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 @Api
@@ -27,6 +29,17 @@ public class AdminReviewController {
 	@ResponseBody
 	@PostMapping("list")
 	@ApiOperation("查询选片列表")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",     value="关键字"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="enroll_type_id",       value="影片性质[申报奖项]ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type_name", value="影片类型"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type_name_short",   value="影片类型扩展分类"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="film_country",value="影片国家地区"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_round", value="审片当前第几轮[1,2,3,4,5,6]"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_state", value="审片状态[0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展]"),
+		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",       value="分页编号"),
+		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
+	})
 	public Object list(String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short, String film_country, Integer[] review_round, Integer[] review_state, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;