x

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

@@ -15,7 +15,7 @@ public interface FilmGroupService {
 
 	void removeFilmGroupById(Integer[] id);
 
-	List<Map<String, Object>> queryNoGroupFilmList(String keyword, Integer enroll_type_id, String film_country, Page page);
+	List<Map<String, Object>> queryNoGroupFilmList(String keyword, Integer enroll_type_id, String film_country, Integer film_type_name_short, Integer play_shanghai, Integer review_round, Integer review_state, Page page);
 
 	List<Map<String, Object>> queryGroupFilmList(Integer[] group_id, String keyword, Integer enroll_type_id, Integer film_type_name,
 			Integer film_type_name_short, Integer play_shanghai, Integer is_important, Integer review_state, Integer review_round,

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

@@ -68,10 +68,14 @@ public class FilmGroupServiceImpl implements FilmGroupService {
 	}
 
 	@Override
-	public List<Map<String, Object>> queryNoGroupFilmList(String keyword, Integer enroll_type_id, String film_country, Page page) {
+	public List<Map<String, Object>> queryNoGroupFilmList(String keyword, Integer enroll_type_id, String film_country, Integer film_type_name_short, Integer play_shanghai, Integer review_round, Integer review_state, Page page) {
 		SqlWhere wehre = new SqlWhere()
 				.eq("t.film_country", film_country)
-				.lk("t.keywords", keyword);
+				.eq("t.film_type_name_short", film_type_name_short)
+				.eq("t.play_shanghai", play_shanghai)
+				.lk("t.keywords", keyword)
+				.eq("r.review_round", review_round)
+				.eq("r.review_state", review_state)
 				;
 		String table = "fc_member_film";
 		if(enroll_type_id != null) {

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

@@ -46,12 +46,12 @@ public class FilmGroupController {
 	@ResponseBody
 	@PostMapping("getFilmList")
 	@ApiOperation("查询未分类影片列表")
-	public Object queryNoGroupFilmList(String keyword, Integer enroll_type_id, String film_country, String[] orderBy, Long index, Long limit) {
+	public Object queryNoGroupFilmList(String keyword, Integer enroll_type_id, String film_country, Integer film_type_name_short, Integer play_shanghai, Integer review_round, Integer review_state, String[] orderBy, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
 		page.setLimitKey(orderBy);
-		List<Map<String, Object>> list = filmGroupService.queryNoGroupFilmList(keyword, enroll_type_id, film_country, page);
+		List<Map<String, Object>> list = filmGroupService.queryNoGroupFilmList(keyword, enroll_type_id, film_country, film_type_name_short, play_shanghai, review_round, review_state, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}