x

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

@@ -484,18 +484,17 @@ public class FilmServiceImpl implements FilmService {
 				.eq("mf.film_type_name", film_type_name)
 				.eq("mf.film_type_name_short", film_type_name_short)
 				.eq("mf.film_country", film_country)
-				.eq("r.review_round", review_round);
+				.eq("r.review_round", review_round)
+				.eq("r.enroll_type_id", enroll_type_id)
+				.in("r.review_state", review_state);
 		String sql = "select mf.id, r.review_round, r.review_id, mf.origion_name, mf.en_name, mf.cn_name, mf.film_type_name, mf.film_country, r.review_state, (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, fc_review r where r.film_id = mf.id" + StringUtil.join(" and ", " and ", "", "", 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;
-		} 
 		return jdbcTemplate.limit(sql, page, w1.getObjectList());
 	}
 
 	@Override
 	@Transactional
 	public void allot(Integer review_id, Integer review_round, Integer[] user_id) {
-		jdbcTemplate.executeUpdate("update fc_review_record set review_state = ? where review_id = ? and review_round = ?", 1, review_id, review_round);
+		//jdbcTemplate.executeUpdate("update fc_review_record set review_state = ? where review_id = ? and review_round = ?", 1, review_id, review_round);
 		if(user_id != null && user_id.length > 0) {
 			for(Integer i : user_id) {
 				String sql = "insert into fc_review_record(review_id, user_id, view_state, review_round, review_state, create_time) select ?, ?, ?, ?, ?, ? from dual where not exists (select * form fc_review_record where review_id = ? and user_id = ? and review_round = ?)";

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

@@ -41,7 +41,6 @@ public class AdminReviewController {
 		@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="分页大小"),
 	})