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

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

@@ -36,4 +36,6 @@ public interface AdminAuthService {
 
 	boolean changePasswordByMemberId(Integer id, String password, String newPassword);
 
+	void delAdmin(Integer[] adminid);
+
 }

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

 package com.egolm.film.api.service;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletOutputStream;
@@ -7,10 +8,10 @@ import javax.servlet.ServletOutputStream;
 public interface ExportService {
 	
 	Map<String, String> getApplyListColumns(); 
-	void exportApplyList(ServletOutputStream os, String[] columns); 
+	void exportApplyList(ServletOutputStream os, String[] columns, List<Map<String, Object>> list); 
 	
 	
 	Map<String, String> getApplyPassListColumns(); 
-	void exportApplyPassList(ServletOutputStream os, String[] columns); 
+	void exportApplyPassList(ServletOutputStream os, String[] columns, List<Map<String, Object>> list); 
 
 }

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

@@ -21,4 +21,11 @@ public interface FilmGroupService {
 			Integer film_type_name_short, Integer play_shanghai, Integer is_important, Integer review_state, Integer review_round,
 			String film_country, Page page);
 
+	List<Map<String, Object>> queryNotInviteList(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, String film_country, Page page);
+
+	void doNotInvite(Integer film_id, Integer not_invite, String not_invite_text);
+
+
 }

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

@@ -123,7 +123,7 @@ public interface ReviewService {
 
 	void allotShowFilmUser(Integer review_id, Integer[] user_id);
 
-	List<Map<String, Object>> queryUserShowList(Integer user_id);
+	List<Map<String, Object>> queryUserShowList(Integer user_id, Page page);
 
 	void toType4(Integer id);
 

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

@@ -40,7 +40,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
 
 	@Override
 	public List<Map<String, Object>> queryAdminList(String keyword, Integer group_id, Page page) {
-		SqlWhere argEdit = new SqlWhere().lk(new String[]{"realname", "username"}, keyword).eq("group_id", group_id);
+		SqlWhere argEdit = new SqlWhere().lk(new String[]{"realname", "username"}, keyword).eq("group_id", group_id).ne("state", 3);
 		String sql = "select * from fc_admin" + StringUtil.join(" and ", " where ", "", "", argEdit.getStringList());
 		return jdbcTemplate.limit(sql, page, argEdit.getObjectArray());
 	}
@@ -51,6 +51,12 @@ public class AdminAuthServiceImpl implements AdminAuthService {
 		jdbcTemplate.executeUpdate(sql, (Object[])adminid);
 	}
 	
+	@Override
+	public void delAdmin(Integer[] adminid) {
+		String sql = "update fc_admin set state = 3 where adminid in (" + StringUtil.join("?", ", ", adminid.length) + ")";
+		jdbcTemplate.executeUpdate(sql, (Object[])adminid);
+	}
+	
 	@Override
 	public void enableAdmin(Integer[] adminid) {
 		String sql = "update fc_admin set state = 1 where adminid in (" + StringUtil.join("?", ", ", adminid.length) + ")";

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

@@ -18,6 +18,7 @@ import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
 import com.egolm.film.api.service.CountryService;
 import com.egolm.film.api.service.ExportService;
+import com.egolm.film.api.service.FilmService;
 import com.egolm.film.api.service.LanguageService;
 import com.egolm.film.api.web.ExportConstant;
 
@@ -27,6 +28,9 @@ public class ExportServiceImpl implements ExportService {
 	@Autowired
 	JdbcTemplate jdbcTemplate;
 	
+	@Autowired
+	FilmService filmService;
+	
 	Map<String, String> countryMap;
 	Map<String, String> languageMap;
 	
@@ -77,42 +81,7 @@ public class ExportServiceImpl implements ExportService {
 	}
 	
 	@Override
-	public void exportApplyList(ServletOutputStream os, String[] columns) {
-		String sql = ""
-				+ "select "
-					+ "mf.id, "
-					+ "mf.film_no, "
-					+ "mf.en_name, "
-					+ "mf.cn_name, "
-					+ "mf.film_type_name, "
-					+ "mf.first_show_date, "
-					+ "mf.first_show_city, "
-					+ "mf.other_filmfest_name, "
-					+ "mf.film_medium, "
-					+ "mf.film_format, "
-					+ "mf.completion_date, "
-					+ "mf.film_country, "
-					+ "mf.co_production_country, "
-					+ "mf.enroll_type_name, "
-					+ "mf.state, "
-					+ "mf.dialogue_lang, "
-					+ "mf.subtitle_lang, "
-					+ "mf.play_shanghai, "
-					+ "mf.film_total_time, "
-					+ "mf.film_apply_company, "
-					+ "mf.film_apply_realname, "
-					+ "mf.film_apply_email, "
-					+ "mf.film_apply_mobile, "
-					+ "mf.film_apply_country, "
-					+ "mf.film_format_url, "
-					+ "mf.film_format_passw, "
-					+ "mf.film_type_name_short, "
-					+ "mf.apply_state "
-				+ " from "
-					+ "fc_member_film mf "
-				+ "where "
-					+ "state = 2";
-		List<Map<String, Object>> list = jdbcTemplate.limitAll(sql, new Page(1L, 1000L, new String[] {"film_no asc", "id asc"}));
+	public void exportApplyList(ServletOutputStream os, String[] columns, List<Map<String, Object>> list) {
 		for(Map<String, Object> map : list) {
 			Integer filmNo = Util.toInt(map.get("film_no"));
 			map.put("film_no", filmNo == null ? null : StringUtil.formatLength(filmNo.toString(), "0000"));
@@ -207,47 +176,7 @@ public class ExportServiceImpl implements ExportService {
 	}
 
 	@Override
-	public void exportApplyPassList(ServletOutputStream os, String[] columns) {
-		String sql = ""
-				+ "select "
-					+ "mf.id, "
-					+ "mf.film_no, "
-					+ "mf.en_name, "
-					+ "mf.cn_name, "
-					+ "mf.film_type_name, "
-					+ "mf.enroll_type_name, "
-					+ "mf.film_total_time, "
-					+ "mf.film_medium, "
-					+ "mf.film_country, "
-					+ "mf.co_production_country, "
-					+ "mf.dialogue_lang, "
-					+ "mf.subtitle_lang, "
-					+ "mf.completion_date, "
-					+ "mf.play_shanghai, "
-					+ "mf.prize, "
-					+ "mf.first_show_date, "
-					+ "mf.first_show_city, "
-					+ "mf.other_filmfest_name, "
-					+ "mf.enroll_type_name_other, "
-					+ "mf.film_apply_company, "
-					+ "mf.film_apply_realname, "
-					+ "mf.film_apply_email, "
-					+ "mf.film_apply_tel, "
-					+ "mf.film_apply_mobile, "
-					+ "mf.film_type_name_short, "
-					+ "mf.film_format, "
-					+ "mf.film_format_url, "
-					+ "mf.film_format_passw, "
-					+ "mf.remark, "
-					+ "r.id review_id, "
-					+ "r.review_round, "
-					+ "r.review_state, "
-					+ "r.opt_state "
-				+ " from "
-					+ "fc_member_film mf left join fc_review r on r.film_id = mf.id "
-				+ "where "
-					+ "state = 2 and apply_state = 2";
-		List<Map<String, Object>> list = jdbcTemplate.limitAll(sql, new Page(1L, 1000L, new String[] {"film_no asc"}));
+	public void exportApplyPassList(ServletOutputStream os, String[] columns, List<Map<String, Object>> list) {
 		String sql0 = "select group_concat(fp.playactor_name) text, fp.film_id, fp.playactor_type from fc_member_film_playactor fp group by fp.film_id, fp.playactor_type";
 		String sql1 = "select group_concat(fi.issuer_company) text, fi.film_id from fc_member_film_issuer fi group by fi.film_id";
 		String sql2 = "select rr.*, u.realname from fc_review_record rr left join fc_user u on u.uid = rr.user_id";
@@ -316,13 +245,13 @@ public class ExportServiceImpl implements ExportService {
 						String review_text_3 = (String)recordMap.get("review_text_3");
 						String review_text_4 = (String)recordMap.get("review_text_4");
 						Double review_score = Util.toDouble(recordMap.get("review_score"));
-						Integer review_state = Util.toInt(recordMap.get("review_state"));
+						Integer record_review_state = Util.toInt(recordMap.get("review_state"));
 						sb.append("评委:").append(realname).append("\r\n");
 						if(review_score != null) {
 							sb.append("评分:").append(review_score).append("\r\n");
 						}
-						if(review_state != null) {
-							sb.append("结论:").append(ExportConstant.reviewState[Integer.valueOf(review_state)]).append("\r\n");
+						if(record_review_state != null) {
+							sb.append("结论:").append(ExportConstant.reviewState[Integer.valueOf(record_review_state)]).append("\r\n");
 						}
 						if(StringUtil.isNotBlank(review_text)) {
 							sb.append("评论:").append(review_text).append("\r\n");

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

@@ -81,7 +81,7 @@ public class FilmGroupServiceImpl implements FilmGroupService {
 				+ "select "
 					+ "t.* "
 				+ "from "
-					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and (t.film_group_id is null or t.film_group_id = 0) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
+					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and (t.film_group_id is null or t.film_group_id = 0) and (t.not_invite is null or t.not_invite = 0) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
 		return jdbcTemplate.limit(sql, page, wehre.getObjectArray());
 	}
 
@@ -112,8 +112,44 @@ public class FilmGroupServiceImpl implements FilmGroupService {
 					+ "r.review_round, "
 					+ "r.opt_state "
 				+ "from "
-					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and t.film_group_id is not null and t.film_group_id != 0 " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
+					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and t.film_group_id is not null and t.film_group_id != 0 and (t.not_invite is null or t.not_invite = 0) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
 		return jdbcTemplate.limit(sql, page, wehre.getObjectArray());
 	}
 	
+	@Override
+	public List<Map<String, Object>> queryNotInviteList(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, String film_country, Page page) {
+		SqlWhere wehre = new SqlWhere()
+				.in("t.film_group_id", group_id)
+				.eq("t.film_type_name", film_type_name)
+				.eq("t.film_type_name_short", film_type_name_short)
+				.eq("t.play_shanghai", play_shanghai)
+				.eq("t.is_important", is_important)
+				.eq("t.film_country", film_country)
+				.eq("r.review_state", review_state)
+				.eq("r.review_round", review_round)
+				.lk("t.keywords", keyword);
+				;
+		
+		String table = "fc_member_film";
+		if(enroll_type_id != null) {
+			table = "(select mf.* from fc_member_film mf, fc_member_film_enroll mfe where mf.id = mfe.film_id and mfe.enroll_type_id = " + enroll_type_id + ")";
+		}
+		String sql = ""
+				+ "select "
+					+ "t.*, "
+					+ "r.review_state, "
+					+ "r.review_round, "
+					+ "r.opt_state "
+				+ "from "
+					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and t.not_invite = 1) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
+		return jdbcTemplate.limit(sql, page, wehre.getObjectArray());
+	}
+
+	@Override
+	public void doNotInvite(Integer film_id, Integer not_invite, String not_invite_text) {
+		jdbcTemplate.executeUpdate("update fc_member_film set not_invite = ?, not_invite_text = ? where id = ?", not_invite, not_invite_text, film_id);
+	}
+
 }

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

@@ -147,7 +147,7 @@ public class ReviewServiceImpl implements ReviewService {
 			Integer enroll_type_id, 
 			Page page) {
 		SqlWhere where = new SqlWhere()
-				.lk(new String[]{"mf.en_name", "mf.cn_name"}, keyword)
+				.lk("mf.keywords", keyword)
 				.ge("r.push_time", start_date)
 				.lt("r.push_time", end_date == null ? null : DateUtil.end(end_date))
 				.ge("r.review_time", review_start_date)
@@ -660,9 +660,9 @@ public class ReviewServiceImpl implements ReviewService {
 	}
 
 	@Override
-	public List<Map<String, Object>> queryUserShowList(Integer user_id) {
+	public List<Map<String, Object>> queryUserShowList(Integer user_id, Page page) {
 		String sql = "select r.id review_id, mf.* from fc_review r left join fc_member_film mf on mf.id = r.film_id, fc_user_film uf where r.id = uf.review_id and uf.user_id = ?";
-		return jdbcTemplate.queryForList(sql, user_id);
+		return jdbcTemplate.limit(sql, page, user_id);
 	}
 
 	@Override

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

@@ -148,6 +148,18 @@ public class AdminAuthController {
 		return Rjx.jsonOk();
 	}
 	
+	@ResponseBody
+	@PostMapping("adminDel")
+	@ApiOperation("禁用管理员")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  name="adminid",   value="管理员ID", allowMultiple=true),
+	})
+	public Object adminDel(Integer[] adminid) {
+		XException.assertNotBlank("管理员ID不能为空", (Object[])adminid);
+		service.delAdmin(adminid);
+		return Rjx.jsonOk();
+	}
+	
 	@ResponseBody
 	@PostMapping("adminEnabled")
 	@ApiOperation("启用管理员")

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

@@ -185,7 +185,7 @@ public class AdminFirstController {
 	@ApiOperation("保存上传状态和上传ID")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id", value="申报影片ID"),
-		@ApiImplicitParam(paramType="query", dataType="int",    required=true, name="upload_state",   value="影片上传状态(0未上传, 1已上传)"),
+		@ApiImplicitParam(paramType="query", dataType="int",    required=true, name="upload_state",   value="影片上传状态(0未上传, 1上传中, 2已上传  3上传失败)"),
 	})
 	public Object save_upload_state(Long member_film_id, Integer upload_state) {
 		filmService.saveUploadState(member_film_id, upload_state);
@@ -260,10 +260,35 @@ public class AdminFirstController {
 	
 	@GetMapping("exportApplyList")
 	@ApiOperation("导出报名列表")
-	public void exportApplyList(HttpServletResponse response, String[] columns) throws IOException {
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",         value="关键字"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="state",           value="影片状态 1未提交 2 已提交"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="apply_state",     value="初审状态 1未初审 2初审通过 3初审否决"),
+		@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="film_type_short", value="影片扩展分类"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="upload_state",    value="影片文件上传状态(0,1)"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="play_shanghai",   value="首映情况"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_round",    value="审片轮数,第几轮审片"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="review_state",    value="审片结论 1通过 2否决 3参赛 4参赛备选 5参展"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="allot_atate",     value="评委分配状态 0未分配评委 1已分配评委评选中"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="opt_state",         value="评选状态 0未评选 1有争议 2管理员分配 3已完成"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_group_id",   value="影片分组ID"),
+		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",           value="分页编号"),
+		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",           value="分页大小"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="limitKey",         value="排序"),
+	})
+	public void exportApplyList(
+			String keyword, String film_country, String play_shanghai, 
+			Integer state, Integer apply_state, Integer film_type, Integer enroll_type, Integer upload_state, Integer film_type_short, 
+			Integer review_round, Integer review_state, Integer allot_atate, Integer opt_state, Integer[] film_group_id, 
+			HttpServletResponse response, String[] columns) throws IOException {
+		Fc_admin admin = Util.mapTo(tokenService.getTokenObj(), Fc_admin.class);
 		response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("报名列表[" + DateUtil.format(new Date(), "yyMMdd-HHmmss") + "].xls", "UTF-8"));
-		exportService.exportApplyList(response.getOutputStream(), columns);
+        List<Map<String, Object>> list = filmService.queryFilmList(admin.getGroup_id(), keyword, state, apply_state, upload_state, film_type, enroll_type, film_country, film_type_short, play_shanghai, review_round, review_state, allot_atate, opt_state, film_group_id, new Page(1L, 9999999999L, new String[] {"id asc"}));
+        exportService.exportApplyList(response.getOutputStream(), columns, list);
 	}
 	
 	@ResponseBody
@@ -275,10 +300,16 @@ public class AdminFirstController {
 	
 	@GetMapping("exportApplyPassList")
 	@ApiOperation("导出影片列表")
-	public void exportApplyPassList(HttpServletResponse response, String[] columns) throws IOException {
+	public void exportApplyPassList(
+			String keyword, String film_country, String play_shanghai, 
+			Integer state, Integer apply_state, Integer film_type, Integer enroll_type, Integer upload_state, Integer film_type_short, 
+			Integer review_round, Integer review_state, Integer allot_atate, Integer opt_state, Integer[] film_group_id, 
+			HttpServletResponse response, String[] columns) throws IOException {
+		Fc_admin admin = Util.mapTo(tokenService.getTokenObj(), Fc_admin.class);
 		response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("影片列表[" + DateUtil.format(new Date(), "yyMMdd-HHmmss") + "].xls", "UTF-8"));
-		exportService.exportApplyPassList(response.getOutputStream(), columns);
+        List<Map<String, Object>> list = filmService.queryFilmList(admin.getGroup_id(), keyword, state, apply_state, upload_state, film_type, enroll_type, film_country, film_type_short, play_shanghai, review_round, review_state, allot_atate, opt_state, film_group_id, new Page(1L, 9999999999L, new String[] {"film_no asc"}));
+        exportService.exportApplyPassList(response.getOutputStream(), columns, list);
 	}
 	
 }
\ No newline at end of file

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

@@ -68,6 +68,30 @@ public class FilmGroupController {
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	
+	@ResponseBody
+	@PostMapping("getNotInviteList")
+	@ApiOperation("查询移除列表(不邀请)")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", name="group_id", value="所属组ID", allowMultiple=true),
+		@ApiImplicitParam(paramType="query", name="keyword", value="搜索关键字"),
+		@ApiImplicitParam(paramType="query", name="enroll_type_id", value="影片性质1,2,3,4"),
+		@ApiImplicitParam(paramType="query", name="film_type_name", value="影片类型 1,2,3,4"),
+		@ApiImplicitParam(paramType="query", name="film_type_name_short", value="影片扩展类型 1,2,3,4,5,6,7"),
+		@ApiImplicitParam(paramType="query", name="play_shanghai", value="首映情况 1,2,3,4,5"),
+		@ApiImplicitParam(paramType="query", name="is_important", value="重点影片 0, 1"),
+		@ApiImplicitParam(paramType="query", name="review_state", value="审片结论  0未评选 1通过 2否决 3参赛 4参赛备选 5参展"),
+		@ApiImplicitParam(paramType="query", name="review_round", value="审片轮数 1,2,3,4,5,6"),
+		@ApiImplicitParam(paramType="query", name="film_country", value="国家地区"),
+	})
+	public Object getNotInviteList(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, String film_country, 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.queryNotInviteList(group_id, keyword, enroll_type_id, film_type_name, film_type_name_short, play_shanghai, is_important, review_state, review_round, film_country, page);
+		return Rjx.jsonOk().setData(list).setPage(page);
+	}
+	
 	@ResponseBody
 	@Transactional
 	@PostMapping("saveOrUpdate")
@@ -116,4 +140,17 @@ public class FilmGroupController {
 		return Rjx.jsonOk();
 	}
 	
+	@ResponseBody
+	@PostMapping("doNotInvite")
+	@ApiOperation("更新不邀请(移出)状态(0, 1)")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", name="film_id",   value="影片ID"),
+		@ApiImplicitParam(paramType="query", name="not_invite", value="是否移出:  1移出,不邀请       0不移出,邀请"),
+		@ApiImplicitParam(paramType="query", name="not_invite_text", value="不邀请,移出说明"),
+	})
+	public Object doNotInvite(Integer film_id, Integer not_invite, String not_invite_text) {
+		filmGroupService.doNotInvite(film_id, not_invite, not_invite_text);
+		return Rjx.jsonOk();
+	}
+	
 }

src/main/java/com/egolm/film/api/web/user/UserReviewController.java

@@ -84,10 +84,21 @@ public class UserReviewController {
 	@ResponseBody
 	@PostMapping("show_list")
 	@ApiOperation("看片列表")
-	public Object getReviewList() {
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType = "query", dataType = "long",      required = false, name = "index",     value="分页页码"),
+		@ApiImplicitParam(paramType = "query", dataType = "long",      required = false, name = "limit",     value="分页大小"),
+		@ApiImplicitParam(paramType = "query", dataType = "string",    required = false, name = "limitKey",     value="分页排序"),
+	})
+	public Object getReviewList(
+			String[] limitKey,
+			Long index, 
+			Long limit) {
 		LoginToken loginToken = tokenService.getToken();
 		Integer user_id = (Integer)loginToken.getId();
-		List<Map<String, Object>> list = service.queryUserShowList(user_id);
+		index = index == null ? 1 : index;
+		limit = limit == null ? 20 : limit;
+		Page page = new Page(index, limit, limitKey);
+		List<Map<String, Object>> list = service.queryUserShowList(user_id, page);
 		return Rjx.jsonOk().setData(list);
 	}
 	

src/main/java/com/egolm/film/bean/Fc_film_upload.java

@@ -11,7 +11,7 @@ public class Fc_film_upload implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@Column(columnDefinition="varchar(255) COMMENT '阿里云视频ID'")
+	@Column(columnDefinition="varchar(255)")
 	private String id;
 
 	@Column(columnDefinition="int(11) COMMENT '影片ID'")
@@ -20,7 +20,7 @@ public class Fc_film_upload implements java.io.Serializable {
 	@Column(columnDefinition="int(11) COMMENT '集数'")
 	private Integer number;
 
-	@Column(columnDefinition="int(11) COMMENT '上传状态  0未上传, 1上传中, 2已上传'")
+	@Column(columnDefinition="int(11) COMMENT '上传状态'")
 	private Integer upload_state;
 
 	@Column(columnDefinition="varchar(255) COMMENT '剧集名'")
@@ -35,7 +35,7 @@ public class Fc_film_upload implements java.io.Serializable {
 	@Column(columnDefinition="datetime COMMENT '完成上传时间'")
 	private Date upload_time;
 
-	@Column(columnDefinition="varchar(36) COMMENT '上传进度'")
+	@Column(columnDefinition="varchar(32) COMMENT '上传进度'")
 	private String upload_progress;
 
 	@Column(columnDefinition="varchar(255) COMMENT '后台服务上传路径'")
@@ -44,7 +44,7 @@ public class Fc_film_upload implements java.io.Serializable {
 	@Column(columnDefinition="varchar(255) COMMENT '后台服务上传失败原因'")
 	private String upload__error_message;
 
-	@Column(columnDefinition="varchar(255) COMMENT '分配的任务名称'")
+	@Column(columnDefinition="varchar(64) COMMENT '后台服务上传任务名称'")
 	private String taskName;
 
 
@@ -145,4 +145,4 @@ public class Fc_film_upload implements java.io.Serializable {
 	}
 
 }
-
+

src/main/java/com/egolm/film/bean/Fc_member_film.java

@@ -239,6 +239,21 @@ public class Fc_member_film implements java.io.Serializable {
 	@Column(columnDefinition="int(11) COMMENT '后台申报人ID'")
 	private Integer admin_creator;
 
+	@Column(columnDefinition="int(1) unsigned COMMENT '是否不邀请 1不邀请'")
+	private Integer not_invite;
+
+	@Column(columnDefinition="varchar(255) COMMENT '归档备注'")
+	private String not_invite_text;
+
+	@Column(columnDefinition="varchar(255) COMMENT '模糊查询关键字(冗余)'")
+	private String keywords;
+
+	@Column(columnDefinition="varchar(255) COMMENT '导演名称(冗余)'")
+	private String director_name;
+
+	@Column(columnDefinition="varchar(255) COMMENT '级别评定'")
+	private String level_text;
+
 
 	public void setId(Long id) {
 		this.id = id;
@@ -840,5 +855,45 @@ public class Fc_member_film implements java.io.Serializable {
 		return admin_creator;
 	}
 
+	public void setNot_invite(Integer not_invite) {
+		this.not_invite = not_invite;
+	}
+
+	public Integer getNot_invite() {
+		return not_invite;
+	}
+
+	public void setNot_invite_text(String not_invite_text) {
+		this.not_invite_text = not_invite_text;
+	}
+
+	public String getNot_invite_text() {
+		return not_invite_text;
+	}
+
+	public void setKeywords(String keywords) {
+		this.keywords = keywords;
+	}
+
+	public String getKeywords() {
+		return keywords;
+	}
+
+	public void setDirector_name(String director_name) {
+		this.director_name = director_name;
+	}
+
+	public String getDirector_name() {
+		return director_name;
+	}
+
+	public void setLevel_text(String level_text) {
+		this.level_text = level_text;
+	}
+
+	public String getLevel_text() {
+		return level_text;
+	}
+
 }
 

src/main/java/com/egolm/film/bean/model/Fc_member_film_base_model.java

@@ -59,7 +59,7 @@ public class Fc_member_film_base_model implements Serializable{
 	@ApiModelProperty("放映场次")private Integer show_number;
 	@ApiModelProperty("片方要求")private String film_requirement;
 	@ApiModelProperty("拷贝选项")private String copy_options;
-	
+	@ApiModelProperty("级别评定")private String level_text;
 	
 	
 	public String getFilm_type_name() {