Merge branch 'master' of http://gitlab.egolm.com/hanxu/siff-film-api

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

@@ -93,7 +93,7 @@ public interface FilmService {
 
 	List<Map<String, Object>> queryListAll(String keyword);
 
-	List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, Integer film_type, Integer enroll_type, String film_country, Page page);
+	List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, Integer upload_state, Integer film_type, Integer enroll_type, String film_country, Page page);
 
 	void pass(Long member_film_id);
 

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

@@ -367,8 +367,8 @@ public class FilmServiceImpl implements FilmService {
 	}
 
 	@Override
-	public List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, Integer film_type, Integer enroll_type, String film_country, Page page) {
-		SqlWhere where = new SqlWhere().lk(new String[]{"mf.en_name", "mf.cn_name"}, keyword).eq("mf.state", state).eq("mf.apply_state", apply_state).lk("mf.enroll_type_name", enroll_type).eq("mf.film_type_name", film_type).eq("mf.film_country", film_country);
+	public List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, Integer upload_state, Integer film_type, Integer enroll_type, String film_country, Page page) {
+		SqlWhere where = new SqlWhere().lk(new String[]{"mf.en_name", "mf.cn_name"}, keyword).eq("mf.state", state).eq("mf.apply_state", apply_state).eq("mf.upload_state", upload_state).lk("mf.enroll_type_name", enroll_type).eq("mf.film_type_name", film_type).eq("mf.film_country", film_country);
 		String sql = "select mf.*, ifnull(rv.review_state, 0) 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 left join fc_review rv on rv.film_id = mf.id" + StringUtil.join(" and ", " where ", "", "", where.getStringList());
 		Object[] objs = where.getObjectList();
 		return jdbcTemplate.limit(sql, page, objs);

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, film_type, enroll_type, film_country, page);
+		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, state, apply_state, null, film_type, enroll_type, film_country, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	
@@ -86,14 +86,15 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type",   value="影片类型"),
 		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="enroll_type", value="影片性质"),
 		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="film_country",value="影片国家地区"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="upload_state",value="影片文件上传状态(0,1)"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",       value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
 	})
-	public Object pass_list(String keyword, Integer film_type, Integer enroll_type, String film_country, Long index, Long limit) {
+	public Object pass_list(String keyword, Integer film_type, Integer enroll_type, Integer upload_state, String film_country, Long index, Long limit) {
 		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, film_type, enroll_type, film_country, page);
+		List<Map<String, Object>> list = memberFilmService.queryChuShenList(keyword, 2, 2, upload_state,film_type, enroll_type, film_country, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}