x

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

@@ -107,6 +107,11 @@ public interface FilmService {
 			Integer enroll_type, 
 			String film_country, 
 			Integer film_type_short, 
+			String play_shanghai, 
+			Integer review_round, 
+			Integer review_state, 
+			Integer allot_atate, 
+			Integer r_state, 
 			Page page);
 
 	Integer pass(Long member_film_id);

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

@@ -404,16 +404,23 @@ public class FilmServiceImpl implements FilmService {
 			Integer enroll_type, 
 			String film_country, 
 			Integer film_type_short, 
+			String play_shanghai, 
+			Integer review_round, 
+			Integer review_state, 
+			Integer allot_atate, 
+			Integer r_state, 
 			Page page) {
-		SqlWhere where = new SqlWhere()
+		SqlWhere where1 = new SqlWhere()
 				.eq("mf.state", state)
 				.eq("mf.apply_state", apply_state)
 				.eq("mf.upload_state", upload_state)
 				.eq("mf.film_type_name", film_type)
 				.eq("mf.film_type_name_short", film_type_short)
 				.eq("mf.film_country", film_country)
+				.eq("mf.play_shanghai", play_shanghai)
 				.lk("mf.enroll_type_name", enroll_type)
 				.lk(new String[]{"mf.en_name", "mf.cn_name", "fp.playactor_name"},  keyword);
+		
 		String sql = ""
 				+ "select "
 					+ "mf.id, "
@@ -442,7 +449,7 @@ public class FilmServiceImpl implements FilmService {
 				+ "where "
 					+ "mf.id = fp.film_id "
 					+ "and fp.playactor_type = 'director' "
-					+ StringUtil.join(" and ", " and ", " ", " ", where.getStringList())
+					+ StringUtil.join(" and ", " and ", " ", " ", where1.getStringList())
 				+ "group by "
 					+ "mf.id, "
 					+ "mf.film_no, "
@@ -464,8 +471,27 @@ public class FilmServiceImpl implements FilmService {
 					+ "r.allot_state, "
 					+ "r.state "
 				+ "order by mf.film_no";
-		Object[] objs = where.getObjectList();
-		return jdbcTemplate.limit(sql, page, objs);
+		
+		List<Object> objs = new ArrayList<Object>();
+		Object[] ary1 = where1.getObjectList();
+		for(Object obj : ary1) {
+			objs.add(obj);
+		}
+		
+		SqlWhere where2 = new SqlWhere()
+				.eq("t.review_round", review_round)
+				.eq("t.review_state", review_state)
+				.eq("t.allot_atate", allot_atate)
+				.eq("t.state", r_state)
+				;
+		
+		sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " and ", " ", " ", where2.getStringList());
+		Object[] ary2 = where2.getObjectList();
+		for(Object obj : ary2) {
+			objs.add(obj);
+		}
+		
+		return jdbcTemplate.limit(sql, page, objs.toArray());
 	}
 
 	@Override

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

@@ -74,7 +74,7 @@ public class AdminFirstController {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, state, apply_state, null, film_type, enroll_type, film_country, film_type_short, page);
+		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, state, apply_state, null, film_type, enroll_type, film_country, film_type_short, null, null, null, null, null, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	
@@ -117,7 +117,11 @@ public class AdminFirstController {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, 2, 2, upload_state,film_type, enroll_type, film_country, film_type_short, page);
+		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, 2, 2, upload_state,film_type, enroll_type, film_country, film_type_short, play_shanghai, 
+				review_round, 
+				review_state, 
+				allot_atate, 
+				r_state, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}