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

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

@@ -28,4 +28,6 @@ public interface AdminUserService {
 
 	List<Fc_user_group_fun> queryGroupFunList(Integer group_id);
 
+	void deleteUserById(Integer uid);
+
 }

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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.egolm.common.jdbc.Page;
 import com.egolm.film.bean.Fc_member_film;
+import com.egolm.film.bean.Fc_member_film_enroll;
 import com.egolm.film.bean.Fc_member_film_issuer;
 import com.egolm.film.bean.Fc_member_film_playactor;
 import com.egolm.film.bean.Fc_member_film_show;
@@ -92,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, String film_type, String enroll_type, String film_country, Page page);
+	List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, Integer film_type, Integer enroll_type, String film_country, Page page);
 
 	void pass(Long member_film_id);
 
@@ -118,7 +119,7 @@ public interface FilmService {
 	 * 进入下一个审片环节
 	 * @param member_film_id
 	 */
-	void toNextRound(Long member_film_id);
+	void toNextRound(Long member_film_id, Integer enroll_type_id);
 
 	/**
 	 * 检索审片列表
@@ -132,12 +133,14 @@ public interface FilmService {
 	 * @return
 	 */
 	List<Map<String, Object>> queryReviewList(String keyword, Integer group_id, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short,
-			String film_country, Integer[] review_round, Integer[] review_state, Page page);
+			String film_country, Integer review_round, Integer[] review_state, Page page);
 
-	void allot(Long member_film_id, Integer review_round, Integer[] user_id);
+	void allot(Long member_film_id, Integer enroll_type_id, Integer review_round, Integer[] user_id);
 
 	void saveUploadId(Long member_film_id, String upload_id);
 
 	void saveUploadState(Long member_film_id, Integer upload_state);
+
+	List<Fc_member_film_enroll> queryFilmEnrollList(Long member_film_id);
 	
 }

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

+package com.egolm.film.api.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.egolm.common.jdbc.Page;
+
+public interface LogService {
+
+	List<Map<String, Object>> queryLogList(String type, Page page);
+
+}

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

@@ -33,7 +33,7 @@ public interface MemberService {
 
 	Fc_member getMemberByToken(String token);
 
-	void updateToken(Integer member_id, String token_string);
+	void updateLoginInfo(Integer member_id, String login_ip, String token_string);
 
 	void updateLanguage(Integer id, String string);
 

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

 package com.egolm.film.api.service;
-//package com.egolm.film.api.user.service;
-//
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Map;
-//
-//import com.egolm.common.bean.Rjx;
-//import com.egolm.common.jdbc.Page;
-//import com.egolm.film.bean.Fc_film;
-//import com.egolm.film.bean.Fc_film_doubtful_point;
-//import com.egolm.film.bean.Fc_film_review;
-//
-//public interface UserReviewService {
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.egolm.common.jdbc.Page;
+
+public interface UserReviewService {
+
+	List<Map<String, Object>> queryReviewList(boolean is_review, Integer user_id, Date push_date, Integer film_type_id, Integer enroll_type_id,	String keyword, Page page);
+
+}
\ No newline at end of file
-//
-//	List<Map<String, Object>> limitReviewList(Long user_id, Page page, Date push_date, String film_type_name, String keyword);
-//
-//	List<Map<String, Object>> limitUnviewList(Long user_id, Page page, Date push_date, String film_type_name, String keyword);
-//
-//	Long queryMemberFilmIdByFilmId(Long film_id);
-//
-//	List<Fc_film_review> queryRoundReviewList(Long user_id, Integer round, Long film_id);
-//
-//	List<Fc_film_doubtful_point> queryDoubtfulList(Long user_id, Long film_id);
-//	
-//	Fc_film queryFilmById(Long film_id);
-//
-//	Integer queryRound(Long user_id, Long film_id);
-//
-//	Rjx queryStatistics(Long user_id);
-//
-//	void doubtfulAppend(Long user_id, Long film_id, Integer round, Integer type, String type_content, Long play_time, Long times);
-//
-//	void playAppend(Long user_id, Long film_id, Integer round, Long playtime, Long watchtime);
-//
-//	void doReject(Long user_id, Long film_id, Integer round, String veto);
-//
-//	void doPass(Long user_id, Long film_id, Integer round, Double score, String content);
-//
-//}

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

@@ -33,8 +33,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
 
 	@Override
 	public List<Map<String, Object>> queryGroupList(String keyword, Page page) {
-		SqlWhere argEdit = new SqlWhere().lk("group_name", keyword);
-		String sql = "select * from fc_admin_group" + StringUtil.join(" and ", " where ", "", "", argEdit.getStringList());
+		SqlWhere argEdit = new SqlWhere().lk("ag.group_name", keyword);
+		String sql = "select ag.*, (select count(adminid) from fc_admin a where a.group_id = ag.group_id) user_count from fc_admin_group ag" + StringUtil.join(" and ", " where ", "", "", argEdit.getStringList());
 		return jdbcTemplate.limit(sql, page, argEdit.getObjectList());
 	}
 

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

@@ -45,8 +45,9 @@ public class AdminTokenServiceImpl implements AdminTokenService {
 						session.setAttribute(TOKEN_NAME, token);
 						Cookie cookie = WebMvcConfig.getOrCreateUUIDCookie(LOGINID_COOKIE_NAME, "/", 60*60*24, true);
 						if(cookie != null) {
-							String sql = "update fc_admin set token = ? where adminid = ?";
-							jdbcTemplate.executeUpdate(sql, cookie.getValue(), adminid);
+							String sql = "update fc_admin set token = ?, login_ip = ?, login_time = ? where adminid = ?";
+							String loginIp = ServletUtil.remoteIp(WebMvcConfig.getRequest());
+							jdbcTemplate.executeUpdate(sql, cookie.getValue(), loginIp, System.currentTimeMillis()/1000, adminid);
 						}
 						return token;
 					} else if(state == 2) {

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

@@ -39,7 +39,7 @@ public class AdminUserServiceImpl implements AdminUserService {
 
 	@Override
 	public List<Map<String, Object>> queryUserList(String keyword, Integer group_id, Page page) {
-		SqlWhere w = new SqlWhere().lk(new String[]{"u.uid", "u.username", "u.realname"}, keyword).eq("u.group_d", group_id);
+		SqlWhere w = new SqlWhere().lk(new String[]{"u.uid", "u.username", "u.realname"}, keyword).eq("u.group_id", group_id);
 		String sql = "select u.*, ug.group_name from fc_user u left join fc_user_group ug on ug.group_id = u.group_id" + StringUtil.join(" and ", " where ", "", "", w.getStringList());
 		return jdbcTemplate.limit(sql, page, w.getObjectList());
 	}
@@ -83,4 +83,9 @@ public class AdminUserServiceImpl implements AdminUserService {
 		return jdbcTemplate.queryForBeans("select * from fc_user_group_fun where group_id = ?", Fc_user_group_fun.class, group_id);
 	}
 
+	@Override
+	public void deleteUserById(Integer uid) {
+		jdbcTemplate.executeUpdate("delete from fc_user where uid = ?", uid);
+	}
+
 }

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

@@ -367,9 +367,9 @@ public class FilmServiceImpl implements FilmService {
 	}
 
 	@Override
-	public List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, String film_type, String 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.film_type_name", film_type).eq("mf.enroll_type_name", enroll_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 and rv.review_round = mf.review_round" + StringUtil.join(" and ", " where ", "", "", where.getStringList());
+	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);
+		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);
 	}
@@ -456,44 +456,44 @@ public class FilmServiceImpl implements FilmService {
 	
 	@Override
 	@Transactional
-	public void toNextRound(Long member_film_id) {
-		Fc_member_film film = this.jdbcTemplate.queryForBean("select * from fc_member_film where id = ?", Fc_member_film.class, member_film_id);
-		Integer round = film.getReview_round();
+	public void toNextRound(Long member_film_id, Integer enroll_type_id) {
+		Fc_member_film_enroll enroll = this.jdbcTemplate.queryForBean("select * from fc_member_film_enroll where film_id = ? and enroll_type_id = ?", Fc_member_film_enroll.class, member_film_id, enroll_type_id);
+		Integer round = enroll.getReview_round();
 		Integer nextRound = null;
 		if(round == null || round == 0) {
 			nextRound = 1;
 		} else {
 			nextRound = round + 1;
 		}
-		jdbcTemplate.executeUpdate("update fc_member_film set review_round = ? where id = ?", nextRound, member_film_id);
-		Integer count = jdbcTemplate.queryForInt("select count(id) from fc_review where film_id = ? and review_round = ?", member_film_id, nextRound);
+		jdbcTemplate.executeUpdate("update fc_member_film_enroll set review_round = ? where film_id = ? and enroll_type_id = ?", nextRound, member_film_id, enroll_type_id);
+		Integer count = jdbcTemplate.queryForInt("select count(id) from fc_review where film_id = ? and review_round = ? and enroll_type_id = ?", member_film_id, nextRound, enroll_type_id);
 		if(count == 0) {
 			Fc_review review = new Fc_review();
+			review.setEnroll_type_id(enroll_type_id);
 			review.setFilm_id(member_film_id.intValue());
 			review.setReview_round(nextRound);
 			review.setReview_state(0);
+			review.setCreate_time(new Date());
 			jdbcTemplate.save(review);
 		}
 	}
 
-	
 	/**
 	 * 检索审片列表
 	 */
 	@Override
 	public List<Map<String, Object>> queryReviewList(String keyword, Integer group_id, Integer enroll_type_id, Integer film_type_name,
-			Integer film_type_name_short, String film_country, Integer[] review_round, Integer[] review_state,
+			Integer film_type_name_short, String film_country, Integer review_round, Integer[] review_state,
 			Page page) {
 		SqlWhere w1 = new SqlWhere()
 				.where("mf.film_type_name in (select agft.film_type_id from fc_admin_group_filmtype agft where agft.group_id = ?)", new Object[]{group_id})
-				.gt("mf.review_round", 0)
+				.gt("r.review_round", 0)
 				.lk(new String[]{"mf.en_name", "mf.cn_name"}, keyword)
 				.eq("mf.film_type_name", film_type_name)
 				.eq("mf.film_type_name_short", film_type_name_short)
 				.eq("mf.film_country", film_country)
-				.in("mf.review_round", review_round)
-				;
-		String sql = "select mf.id, mf.review_round, mf.origion_name, mf.en_name, mf.cn_name, mf.film_type_name, mf.film_country, r.review_state, r.result_text, (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 r on r.film_id = mf.id and r.review_round = mf.review_round" + StringUtil.join(" and ", " where ", "", "", w1.getStringList());
+				.eq("r.review_round", review_round);
+		String sql = "select mf.id, r.review_round, mf.origion_name, mf.en_name, mf.cn_name, mf.film_type_name, mf.film_country, r.review_state, r.result_text, (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;
 		} 
@@ -502,16 +502,21 @@ public class FilmServiceImpl implements FilmService {
 
 	@Override
 	@Transactional
-	public void allot(Long member_film_id, Integer review_round, Integer[] user_id) {
-		jdbcTemplate.executeUpdate("delete from fc_review_user where film_id = ? and review_round = ?", member_film_id, review_round);
+	public void allot(Long member_film_id, Integer enroll_type_id, Integer review_round, Integer[] user_id) {
+		Fc_review review = jdbcTemplate.queryForBean("select * from fc_review where film_id = ? and enroll_type_id = ? and review_round = ?", Fc_review.class, member_film_id, enroll_type_id, review_round);
+		jdbcTemplate.executeUpdate("delete from fc_review_user where review_id = ?", review.getId());
+		review.setReview_state(1);
+		jdbcTemplate.update(review);
 		if(user_id != null && user_id.length > 0) {
 			List<Fc_review_user> list = new ArrayList<Fc_review_user>();
 			for(Integer i : user_id) {
-				list.add(new Fc_review_user(member_film_id.intValue(), review_round, i, 0));
+				Fc_review_user ru = new Fc_review_user();
+				ru.setReview_id(review.getId());
+				ru.setUser_id(i);
+				ru.setView_state(0);
 			}
 			jdbcTemplate.batchSave(list);
 		}
-		
 	}
 
 	@Override
@@ -524,4 +529,9 @@ public class FilmServiceImpl implements FilmService {
 		jdbcTemplate.executeUpdate("update fc_member_film set upload_state = ? where id = ?", upload_state, member_film_id);
 	}
 
+	@Override
+	public List<Fc_member_film_enroll> queryFilmEnrollList(Long member_film_id) {
+		return jdbcTemplate.queryForBeans("select * from fc_member_film_enroll where film_id = ?", Fc_member_film_enroll.class, member_film_id.intValue());
+	}
+
 }

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

+package com.egolm.film.api.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.egolm.common.jdbc.JdbcTemplate;
+import com.egolm.common.jdbc.Page;
+import com.egolm.film.api.service.LogService;
+
+@Service
+public class LogServiceImpl implements LogService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+	@Override
+	public List<Map<String, Object>> queryLogList(String type, Page page) {
+		return jdbcTemplate.limit("select l.*, le.ext from fc_log l left join fc_log_ext le on le.path = l.path", page);
+	}
+
+}

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

@@ -104,9 +104,9 @@ public class MemberServiceImpl implements MemberService {
 	}
 
 	@Override
-	public void updateToken(Integer member_id, String token_string) {
-		String sql = "update fc_member set token = ? where id = ?";
-		jdbcTemplate.executeUpdate(sql, token_string, member_id);
+	public void updateLoginInfo(Integer member_id, String login_ip, String token_string) {
+		String sql = "update fc_member set token = ?, login_time = ?, login_ip = ? where id = ?";
+		jdbcTemplate.executeUpdate(sql, token_string, System.currentTimeMillis()/1000, login_ip, member_id);
 	}
 
 	@Override

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

@@ -53,7 +53,8 @@ public class MemberTokenServiceImpl implements MemberTokenService {
 				session.setAttribute(TOKEN_NAME, token);
 				Cookie cookie = WebMvcConfig.getOrCreateUUIDCookie(LOGINID_COOKIE_NAME, "/", 60*60, true);
 				if(cookie != null) {
-					memberService.updateToken(id, cookie.getValue());
+					String loginIp = ServletUtil.remoteIp(WebMvcConfig.getRequest());
+					memberService.updateLoginInfo(id, loginIp, cookie.getValue());
 				}
 				return token;
 			} else {

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

 package com.egolm.film.api.service.impl;
-//package com.egolm.film.api.user.service.impl;
-//
-//import java.math.BigDecimal;
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Map;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import com.egolm.common.DateUtil;
-//import com.egolm.common.StringUtil;
-//import com.egolm.common.bean.Rjx;
-//import com.egolm.common.jdbc.JdbcTemplate;
-//import com.egolm.common.jdbc.Page;
-//import com.egolm.film.api.user.service.UserReviewService;
-//import com.egolm.film.bean.Fc_film;
-//import com.egolm.film.bean.Fc_film_doubtful_point;
-//import com.egolm.film.bean.Fc_film_review;
-//import com.egolm.film.bean.Fc_film_user_play;
-//import com.egolm.film.config.WebMvcConfig;
-//
-//@Service
-//public class UserReviewServiceImpl implements UserReviewService {
-//
-//	@Autowired
-//	private JdbcTemplate jdbcTemplate;
-//
-//	@Override
-//	public List<Map<String, Object>> limitReviewList(
-//			Long user_id, 
-//			Page page, 
-//			Date push_date,
-//			String film_type_name, 
-//			String keyword) {
-//		
-//		List<Object> args = new ArrayList<Object>();
-//		List<String> strs = new ArrayList<String>();
-//		args.add(user_id);
-//		
-//		if(push_date != null) {
-//			strs.add("allot.push_time >= ?");
-//			strs.add("allot.push_time < ?");
-//			args.add(DateUtil.start(push_date).getTime()/1000);
-//			args.add(DateUtil.end(DateUtil.start(push_date)).getTime()/1000);
-//		}
-//		if(film_type_name != null && film_type_name.trim().length() > 0) {
-//			strs.add("film.film_type_name = ?");
-//			args.add(film_type_name);
-//		}
-//		if(keyword != null && keyword.trim().length() > 0) {
-//			strs.add("(film.en_name like ? or film.cn_name like ?)");
-//			args.add("%" + keyword + "%");
-//			args.add("%" + keyword + "%");
-//		}
-//		
-//		String sql = ""
-//				+ "	select "
-//					+ "film.*, "
-//					+ "allot.uid, "
-//					+ "allot.review_round, "
-//					+ "allot.film_id, "
-//					+ "allot.push_time, "
-//					+ "review.is_save, "
-//					+ "review.state review_state, "
-//					+ "review.save_state "
-//				+ "from "
-//					+ "fc_film_allot allot "
-//					+ "left join fc_film film on film.id = allot.film_id "
-//					+ "left join fc_film_review review on review.film_id = allot.film_id and review.uid = allot.uid and review.round = allot.review_round "
-//				+ "where "
-//					+ "allot.uid = ? "
-//					+ "and review.state > 0" 
-//					+ StringUtil.join(" and ", " ", "", "", strs);
-//		return jdbcTemplate.limit(sql, page, args.toArray());
-//	}
-//
-//	@Override
-//	public List<Map<String, Object>> limitUnviewList(
-//			Long user_id, 
-//			Page page, 
-//			Date push_date, 
-//			String film_type_name, 
-//			String keyword) {
-//		
-//		List<Object> args = new ArrayList<Object>();
-//		List<String> strs = new ArrayList<String>();
-//		args.add(user_id);
-//		if(push_date != null) {
-//			strs.add("allot.push_time >= ?");
-//			strs.add("allot.push_time < ?");
-//			args.add(DateUtil.start(push_date).getTime()/1000);
-//			args.add(DateUtil.end(DateUtil.start(push_date)).getTime()/1000);
-//		}
-//		if(film_type_name != null && film_type_name.trim().length() > 0) {
-//			strs.add("film.film_type_name = ?");
-//			args.add(film_type_name);
-//		}
-//		if(keyword != null && keyword.trim().length() > 0) {
-//			strs.add("(film.en_name like ? or film.cn_name like ?)");
-//			args.add("%" + keyword + "%");
-//			args.add("%" + keyword + "%");
-//		}
-//		
-//		String sql = ""
-//				+ "	select "
-//					+ "film.*, "
-//					+ "allot.uid, "
-//					+ "allot.review_round, "
-//					+ "allot.film_id, "
-//					+ "allot.push_time, "
-//					+ "review.is_save, "
-//					+ "review.state review_state, "
-//					+ "review.save_state "
-//				+ "from "
-//					+ "fc_film_allot allot "
-//					+ "left join fc_film film on film.id = allot.film_id "
-//					+ "left join fc_film_review review on review.film_id = allot.film_id and review.uid = allot.uid and review.round = allot.review_round "
-//				+ "where "
-//					+ "allot.uid = ? "
-//					+ "and review.state is null" 
-//					+ StringUtil.join(" and ", " ", "", "", strs);
-//		return jdbcTemplate.limit(sql, page, args.toArray());
-//	}
-//
-//	@Override
-//	public Long queryMemberFilmIdByFilmId(Long film_id) {
-//		String sql = "select mf.id from fc_member_film mf, fc_film f where mf.film_no = f.film_no and f.id = ?";
-//		return jdbcTemplate.queryForLong(sql, film_id);
-//	}
-//
-//	@Override
-//	public List<Fc_film_review> queryRoundReviewList(Long user_id, Integer round, Long film_id) {
-//		String sql = "SELECT fc_film_review.* FROM fc_film_review WHERE film_id = ? AND uid = ? AND round = ?";
-//		return jdbcTemplate.queryForBeans(sql, Fc_film_review.class, film_id, user_id, round);
-//	}
-//
-//	@Override
-//	public List<Fc_film_doubtful_point> queryDoubtfulList(Long user_id, Long film_id) {
-//		String sql = "SELECT * FROM fc_film_doubtful_point WHERE uid = ? AND film_id = ?";
-//		return jdbcTemplate.queryForBeans(sql, Fc_film_doubtful_point.class, user_id, film_id);
-//	}
-//
-//	@Override
-//	public Fc_film queryFilmById(Long film_id) {
-//		return jdbcTemplate.queryForBean("select * from fc_film where id = ?", Fc_film.class, film_id);
-//	}
-//
-//	@Override
-//	public Integer queryRound(Long user_id, Long film_id) {
-//		return jdbcTemplate.queryForInt("select round from fc_film_allot where film_id = ? and uid = ?", film_id, user_id);
-//	}
-//
-//	@Override
-//	public Rjx queryStatistics(Long user_id) {
-//		String sql0 = "SELECT count(*) as total FROM fc_view_allot WHERE uid = ?";
-//		String sql1 = "SELECT count(*) as total FROM fc_view_allot WHERE uid = ? AND review_state = 4";
-//		String sql2 = "SELECT count(*) as total FROM fc_view_allot WHERE uid = ? AND review_state = 2";
-//		String sql3 = "SELECT count(*) as total FROM fc_view_allot WHERE uid = ? AND (review_state = 3 or review_state = 5)";
-//		String sql4 = "SELECT count(*) as total FROM fc_view_allot WHERE uid = ? AND review_state = 6";
-//		Integer count0 = jdbcTemplate.queryForInt(sql0, user_id);
-//		Integer count1 = jdbcTemplate.queryForInt(sql1, user_id);
-//		Integer count2 = jdbcTemplate.queryForInt(sql2, user_id);
-//		Integer count3 = jdbcTemplate.queryForInt(sql3, user_id);
-//		Integer count4 = jdbcTemplate.queryForInt(sql4, user_id);
-//		
-//		Double rate_1 = 0D;
-//		Double rate_2 = 0D;
-//		Double rate_3 = 0D;
-//		Double rate_4 = 0D;
-//		
-//		if(count0 > 0) {
-//			rate_1 = (double)count1/(double)count0;
-//			rate_2 = (double)count2/(double)count0;
-//			rate_3 = (double)count3/(double)count0;
-//			rate_4 = (double)count4/(double)count0;
-//		}
-//		
-//		return Rjx.jsonOk()
-//				.set("total", count0)
-//				.set("count_state_4", count1)
-//				.set("count_state_2", count2)
-//				.set("count_state_3_5", count3)
-//				.set("count_state_6", count4)
-//				.set("rate_1", toRate(rate_1))
-//				.set("rate_2", toRate(rate_2))
-//				.set("rate_3", toRate(rate_3))
-//				.set("rate_4", toRate(rate_4))
-//				;
-//	}
-//	
-//	private String toRate(Double dou) {
-//		return new BigDecimal(dou*100).setScale(2, BigDecimal.ROUND_HALF_UP) + "%";
-//	}
-//
-//	@Override
-//	public void doubtfulAppend(
-//			Long user_id, 
-//			Long film_id, 
-//			Integer round, 
-//			Integer type, 
-//			String type_content, 
-//			Long play_time, 
-//			Long times) {
-//		
-//		Fc_film_doubtful_point doubtful = new Fc_film_doubtful_point();
-//		String ip = WebMvcConfig.getRemoteIp();
-//		doubtful.setCreate_ip(ip);
-//		doubtful.setCreate_time(System.currentTimeMillis());
-//		doubtful.setFilm_id(film_id);
-//		doubtful.setPlay_time(play_time + "");
-//		doubtful.setRound(round);
-//		doubtful.setTimes(times);
-//		doubtful.setType(type);
-//		doubtful.setType_content(type_content);
-//		doubtful.setUid(user_id);
-//		jdbcTemplate.save(doubtful);
-//	}
-//
-//	@Override
-//	public void playAppend(
-//			Long user_id, 
-//			Long film_id, 
-//			Integer round, 
-//			Long playtime, 
-//			Long watchtime) {
-//		
-//		Fc_film_user_play play = new Fc_film_user_play();
-//		play.setAddtime(System.currentTimeMillis());
-//		play.setFilm_id(film_id);
-//		play.setPlaytime(playtime + "");
-//		play.setRound(round);
-//		play.setWatchtime(watchtime);
-//		play.setUid(user_id);
-//		jdbcTemplate.save(play);
-//	}
-//
-//	@Override
-//	public void doReject(
-//			Long user_id,
-//			Long film_id, 
-//			Integer round, 
-//			String veto) {
-//		
-//		boolean isSave = false;
-//		Fc_film_review review = null;
-//		try {
-//			String sql = "select * from fc_film_review where uid = ? and film_id = ? and round = ?";
-//			review = this.jdbcTemplate.queryForBean(sql, Fc_film_review.class, user_id, film_id, round);
-//		} catch (Exception e) {
-//			isSave = true;
-//			review = new Fc_film_review();
-//			review.setUid(user_id);
-//			review.setFilm_id(film_id);
-//		}
-//		String ip = WebMvcConfig.getRemoteIp();
-//		review.setRound(round);
-//		review.setVeto(veto);
-//		review.setReview_ip(ip);
-//		review.setReview_time(System.currentTimeMillis());
-//		review.setState(2);
-//		if(isSave) {
-//			this.jdbcTemplate.save(review);
-//		} else {
-//			this.jdbcTemplate.update(review);
-//		}
-//	}
-//
-//	@Override
-//	public void doPass(
-//			Long user_id, 
-//			Long film_id, 
-//			Integer round,
-//			Double score, 
-//			String content) {
-//		boolean isSave = false;
-//		Fc_film_review review = null;
-//		try {
-//			String sql = "select * from fc_film_review where uid = ? and film_id = ? and round = ?";
-//			review = this.jdbcTemplate.queryForBean(sql, Fc_film_review.class, user_id, film_id, round);
-//		} catch (Exception e) {
-//			isSave = true;
-//			review = new Fc_film_review();
-//			review.setUid(user_id);
-//			review.setFilm_id(film_id);
-//		}
-//		String ip = WebMvcConfig.getRemoteIp();
-//		review.setRound(round);
-//		review.setSelect_result(content);
-//		review.setReview_ip(ip);
-//		review.setAward_1_score(new BigDecimal(score));
-//		review.setReview_time(System.currentTimeMillis());
-//		review.setState(1);
-//		if(isSave) {
-//			this.jdbcTemplate.save(review);
-//		} else {
-//			this.jdbcTemplate.update(review);
-//		}
-//	}
-//	
-//}
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.egolm.common.DateUtil;
+import com.egolm.common.StringUtil;
+import com.egolm.common.jdbc.JdbcTemplate;
+import com.egolm.common.jdbc.Page;
+import com.egolm.film.api.service.UserReviewService;
+import com.egolm.film.util.SqlWhere;
+
+@Service
+public class UserReviewServiceImpl implements UserReviewService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+	@Override
+	public List<Map<String, Object>> queryReviewList(boolean is_review, Integer user_id, Date push_date, Integer film_type_id, Integer enroll_type_id, String keyword, Page page) {
+		SqlWhere where = new SqlWhere().eq("r.enroll_type_id", enroll_type_id).lk(new String[]{"en_name", "cn_name"}, keyword);
+		if(is_review) {
+			where.ge("r.review_state", 2);
+		} else {
+			where.lt("r.review_state", 2);
+		}
+		if(push_date != null) {
+			where.ge("r.create_time", DateUtil.start(push_date)).lt("r.create_time", DateUtil.end(push_date));
+		}
+		String sql = ""
+				+ "select "
+					+ "mf.*, "
+					+ "r.enroll_type_id, "
+					+ "r.review_round, "
+					+ "r.create_time push_time, "
+					+ "ru.view_state, "
+					+ "ru.review_state, "
+					+ "ru.review_score, "
+					+ "ru.retiew_text, "
+					+ "ru.retiew_text_summary, "
+					+ "ru.review_text_theme, "
+					+ "ru.review_text_style, "
+					+ "ru.review_text_keynote "
+				+ "from "
+					+ "fc_member_film mf, fc_review r, fc_review_user ru "
+				+ "where "
+					+ "mf.id = r.film_id "
+					+ "and r.id = ru.review_id "
+					+ "and ru.user_id = " + user_id 
+					+ StringUtil.join(" and ", " and ", "", "", where.getStringList());
+		return jdbcTemplate.limit(sql, page, where.getObjectList());
+	}
+
+
+}

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

@@ -49,7 +49,9 @@ public class UserTokenServiceImpl implements UserTokenService {
 				session.setAttribute(TOKEN_NAME, token);
 				Cookie cookie = WebMvcConfig.getOrCreateUUIDCookie(LOGINID_COOKIE_NAME, "/", 60*60*24, true);
 				if(cookie != null) {
-					jdbcTemplate.executeUpdate("update fc_user set token = ? where uid = ?", cookie.getValue(), uid);
+					String sql = "update fc_user set token = ?, login_ip = ?, login_time = ? where uid = ?";
+					String loginIp = ServletUtil.remoteIp(WebMvcConfig.getRequest());
+					jdbcTemplate.executeUpdate(sql, cookie.getValue(), loginIp, System.currentTimeMillis()/1000, uid);
 				}
 				return token;
 			} else {

src/main/java/com/egolm/film/api/web/FilmController.java

@@ -24,7 +24,7 @@ import io.swagger.annotations.ApiOperation;
 
 @Api
 @Controller
-@RequestMapping({"member/apply", "admin/first"})
+@RequestMapping({"member/apply", "admin/first", "user/base"})
 public class FilmController {
 	
 	@Autowired

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

@@ -149,7 +149,7 @@ public class AdminAuthController {
 	
 	@ResponseBody
 	@PostMapping("adminEnabled")
-	@ApiOperation("禁用管理员")
+	@ApiOperation("启用管理员")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  name="adminid",   value="管理员ID", allowMultiple=true),
 	})
@@ -222,7 +222,7 @@ public class AdminAuthController {
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  allowMultiple=true, name="menu_id",      value="菜单ID"),
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  allowMultiple=true, name="film_type_id", value="影片类型ID"),
 	})
-	public Object groupAuthUpdate(Integer group_id, Integer[] menu_id, Integer[] film_type_id) {
+	public Object groupAuthUpdate(Integer group_id, Integer state, Integer[] menu_id, Integer[] film_type_id) {
 		service.updateGroupAuth(group_id, menu_id, film_type_id);
 		return Rjx.jsonOk();
 	}

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

@@ -24,6 +24,7 @@ import com.egolm.film.api.service.MemberService;
 import com.egolm.film.api.service.Messages;
 import com.egolm.film.bean.Fc_member;
 import com.egolm.film.bean.Fc_member_film;
+import com.egolm.film.bean.Fc_member_film_enroll;
 import com.egolm.film.util.Common;
 
 import io.swagger.annotations.Api;
@@ -69,7 +70,7 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",       value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
 	})
-	public Object list(String keyword, Integer state, Integer apply_state, String film_type, String enroll_type, String film_country, Long index, Long limit) {
+	public Object list(String keyword, Integer state, Integer apply_state, Integer film_type, Integer enroll_type, String film_country, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
@@ -88,7 +89,7 @@ public class AdminFirstController {
 		@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, String film_type, String enroll_type, String film_country, Long index, Long limit) {
+	public Object pass_list(String keyword, Integer film_type, Integer enroll_type, String film_country, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
@@ -111,7 +112,10 @@ public class AdminFirstController {
 		film.setFilm_type_name_short(film_type_name_short);
 		memberFilmService.mergeMemberFilm(film);
 		memberFilmService.pass(member_film_id);
-		memberFilmService.toNextRound(member_film_id);
+		List<Fc_member_film_enroll> enrolls = memberFilmService.queryFilmEnrollList(member_film_id);
+		for(Fc_member_film_enroll enroll : enrolls) {
+			memberFilmService.toNextRound(member_film_id, enroll.getEnroll_type_id());
+		}
 		Fc_member_film memberFilm = memberFilmService.queryMemberFilmById(member_film_id);
 		Fc_member member = memberService.getMemberById(memberFilm.getMember_id());
 		Locale locale = new Locale("zh", "CN");

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

+package com.egolm.film.api.web.admin;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.egolm.common.bean.Rjx;
+import com.egolm.common.jdbc.Page;
+import com.egolm.film.api.service.LogService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api
+@Controller
+@RequestMapping("admin/log")
+public class AdminLogController {
+
+	@Autowired
+	LogService service;
+	
+	@ResponseBody
+	@PostMapping("list")
+	@ApiOperation("查询日志")
+	public Object list(String type, 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 = service.queryLogList(type, page);
+		return Rjx.jsonOk().setData(list);
+	}
+	
+}

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

@@ -45,7 +45,7 @@ public class AdminReviewController {
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",                value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",                value="分页大小"),
 	})
-	public Object list(String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short, String film_country, Integer[] review_round, Integer[] review_state, Long index, Long limit) {
+	public Object list(String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short, String film_country, Integer review_round, Integer[] review_state, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
@@ -58,12 +58,13 @@ public class AdminReviewController {
 	@PostMapping("allot")
 	@ApiOperation("分配审片评委")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="long",    required=true, name="member_film_id",       value="影片ID"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=true, name="review_round",       value="审片环节"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=true, name="user_id",           value="审片评委ID"),
+		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="member_film_id",       value="影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="enroll_type_id",       value="影片性质[申报奖项]ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="review_round",       value="审片环节"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="user_id",           value="审片评委ID"),
 	})
-	public Object allot(Long member_film_id, Integer review_round, Integer[] user_id) {
-		filmService.allot(member_film_id, review_round, user_id);
+	public Object allot(Long member_film_id, Integer enroll_type_id, Integer review_round, Integer[] user_id) {
+		filmService.allot(member_film_id, enroll_type_id, review_round, user_id);
 		return Rjx.jsonOk();
 	}
 	

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

@@ -51,7 +51,7 @@ public class AdminUserController {
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
 		List<Map<String, Object>> list = service.queryGroupList(keyword, page);
-		return Rjx.jsonOk().setData(list);
+		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	
 	@ResponseBody
@@ -76,19 +76,20 @@ public class AdminUserController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="int",    required=false, name="group_id",   value="分组ID"),
 		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="group_name", value="分组名称"),
+		@ApiImplicitParam(paramType="query", dataType="int",    required=true,  name="state",      value="状态"),
 		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="job_desc",   value="工作介绍"),
 		@ApiImplicitParam(paramType="query", dataType="int",    required=true,  name="fun_id",     value="权限[功能]ID [1-6]选权限,7快进后退权限"),
 	})
-	public Rjx saveGroup(Integer group_id, String group_name, String job_desc, Integer[] fun_id) {
+	public Rjx saveGroup(Integer group_id, String group_name, Integer state, String job_desc, Integer[] fun_id) {
 		Fc_user_group group = new Fc_user_group();
 		group.setGroup_id(group_id);
 		group.setGroup_name(group_name);
+		group.setState(state);
 		group.setJob_desc(job_desc);
 		if(group_id == null) {
 			group.setAdminid((Integer)tokenService.getToken().getId());
 			group.setCreate_ip(WebMvcConfig.getRemoteIp());
 			group.setCreate_time(new Date());
-			group.setState(1);
 		}
 		service.mergeGroup(group);
 		service.saveGroupFun(group.getGroup_id(), fun_id);
@@ -109,7 +110,7 @@ public class AdminUserController {
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
 		List<Map<String, Object>> list = service.queryUserList(keyword, group_id, page);
-		return Rjx.jsonOk().setData(list);
+		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	
 	@ResponseBody
@@ -153,4 +154,16 @@ public class AdminUserController {
 		}
 		return Rjx.jsonOk().setData(user);
 	}
+	
+	@ResponseBody
+	@Transactional
+	@PostMapping("user_delete")
+	@ApiOperation("删除评委")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="int",    required=false, name="uid",   value="评委ID"),
+	})
+	public Rjx deleteUser(Integer uid) {
+		service.deleteUserById(uid);
+		return Rjx.jsonOk();
+	}
 }

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

 package com.egolm.film.api.web.user;
-//package com.egolm.film.api.user;
-//
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Map;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import com.egolm.common.bean.Rjx;
-//import com.egolm.common.jdbc.Page;
-//import com.egolm.film.api.member.service.MemberService;
-//import com.egolm.film.api.user.service.UserReviewService;
-//import com.egolm.film.api.user.service.UserTokenService;
-//import com.egolm.film.bean.Fc_film_doubtful_point;
-//import com.egolm.film.bean.Fc_film_review;
-//import com.egolm.film.bean.Fc_member_film;
-//import com.egolm.film.bean.Fc_member_film_director;
-//import com.egolm.film.bean.Fc_member_film_issuer;
-//import com.egolm.film.bean.Fc_member_film_playactor;
-//import com.egolm.film.bean.Fc_member_film_show;
-//import com.egolm.film.model.LoginToken;
-//
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiImplicitParam;
-//import io.swagger.annotations.ApiImplicitParams;
-//import io.swagger.annotations.ApiOperation;
-//
-//@Api
-//@Controller
-//@RequestMapping("user/review")
-//public class UserReviewController {
-//	
-//	@Autowired
-//	private UserTokenService tokenService;
-//	
-//	@Autowired
-//	private UserReviewService reviewService;
-//	
-//	@Autowired
-//	private MemberService memberService;
-//
-//	@ResponseBody
-//	@PostMapping("review_list")
-//	@ApiOperation("已审核列表")
-//	@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="分页排序", allowMultiple=true),
-//		@ApiImplicitParam(paramType = "query", dataType = "date",   required = false, name = "push_date", value="推送日期"),
-//		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "film_type_name", value="影片类型"),
-//		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "keyword", value="模糊匹配关键词"),
-//	})
-//	public Object getReviewList(Long index, Long limit,  String[] limitKey, Date push_date, String film_type_name, String keyword) {
-//		index = index == null ? 1 : index;
-//		limit = limit == null ? 20 : limit;
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		Page page = new Page(index, limit, limitKey);
-//		List<Map<String, Object>> list = reviewService.limitReviewList(user_id, page, push_date, film_type_name, keyword);
-//		return Rjx.jsonOk().setData(list).setPage(page);
-//	}
-//	
-//	
-//	@ResponseBody
-//	@PostMapping("unview_list")
-//	@ApiOperation("未审核列表")
-//	@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="分页排序", allowMultiple=true),
-//		@ApiImplicitParam(paramType = "query", dataType = "date",   required = false, name = "push_date", value="推送日期"),
-//		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "film_type_name", value="影片类型"),
-//		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "keyword", value="模糊匹配关键词"),
-//	})
-//	public Object getUnviewList(Long index, Long limit,  String[] limitKey, Date push_date, String film_type_name, String keyword) {
-//		index = index == null ? 1 : index;
-//		limit = limit == null ? 20 : limit;
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		Page page = new Page(index, limit, limitKey);
-//		List<Map<String, Object>> list = reviewService.limitUnviewList(user_id, page, push_date, film_type_name, keyword);
-//		return Rjx.jsonOk().setData(list).setPage(page);
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("member_apply_detail")
-//	@ApiOperation("查询申报影片详细信息")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "film_id",    value="影片ID"),
-//	})
-//	public Object getMemberApplyDetail(Long film_id) {
-//		Long member_film_id = reviewService.queryMemberFilmIdByFilmId(film_id);
-//		Fc_member_film memberFilm = memberService.queryMemberFilmById(member_film_id);
-//		List<Fc_member_film_director> directorList = memberService.queryMemberFilmDirectorList(member_film_id);
-//		List<Fc_member_film_issuer> issuerList = memberService.queryMemberFilmIssuerList(member_film_id);
-//		List<Fc_member_film_playactor> playactorList = memberService.queryMemberFilmPlayactorList(member_film_id);
-//		List<Fc_member_film_show> showList = memberService.queryMemberFilmShowList(member_film_id);
-//		
-//		return Rjx.jsonOk()
-//				.setData(memberFilm)
-//				.set("member_film_id", member_film_id)
-//				.set("directorList", directorList)
-//				.set("issuerList", issuerList)
-//				.set("playactorList", playactorList)
-//				.set("showList", showList)
-//				;
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("review_record_list")
-//	@ApiOperation("查询评审记录列表")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = false, name = "film_id",    value="影片ID"),
-//	})
-//	public Object getReviewRecordList(Long film_id) {
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		Integer round = reviewService.queryRound(user_id, film_id);
-//		List<Fc_film_review> reviewList = reviewService.queryRoundReviewList(user_id, round, film_id);
-//		return Rjx.jsonOk().setData(reviewList);
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("doubtful_list")
-//	@ApiOperation("查询疑点列表")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = false, name = "film_id",    value="影片ID"),
-//	})
-//	public Object getDoubtfulList(Long film_id) {
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		List<Fc_film_doubtful_point> doubtfulList = reviewService.queryDoubtfulList(user_id, film_id);
-//		return Rjx.jsonOk().setData(doubtfulList);
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("doubtful_append")
-//	@ApiOperation("增加疑点")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "film_id",      value="影片ID"),
-//		@ApiImplicitParam(paramType = "query", dataType = "int",    required = true, name = "type",         value="疑点类型"),
-//		@ApiImplicitParam(paramType = "query", dataType = "string", required = true, name = "type_content", value="疑点说明"),
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "play_time",    value="播放时间"),
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "times",        value="次数"),
-//	})
-//	public Object doubtfulAppend(Long film_id, Integer type, String type_content, Long play_time, Long times) {
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		Integer round = reviewService.queryRound(user_id, film_id);
-//		reviewService.doubtfulAppend(user_id, film_id, round, type, type_content, play_time, times);
-//		return Rjx.jsonOk();
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("play_append")
-//	@ApiOperation("增加播放记录")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "film_id",       value="影片ID"),
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "playtime",      value="播放时间"),
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "watchtime",     value="观看时间"),
-//	})
-//	public Object playAppend(Long film_id, Long playtime, Long watchtime) {
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		Integer round = reviewService.queryRound(user_id, film_id);
-//		reviewService.playAppend(user_id, film_id, round, playtime, watchtime);
-//		return Rjx.jsonOk();
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("do_reject")
-//	@ApiOperation("审片否决")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = false, name = "film_id", value="影片ID"),
-//		@ApiImplicitParam(paramType = "query", dataType = "string", required = false, name = "veto",    value="否决理由"),
-//	})
-//	public Object doReject(Long film_id, String veto) {
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		Integer round = reviewService.queryRound(user_id, film_id);
-//		reviewService.doReject(user_id, film_id, round, veto);
-//		return Rjx.jsonOk();
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("do_pass")
-//	@ApiOperation("审片通过")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(paramType = "query", dataType = "long",   required = true, name = "film_id",       value="影片ID"),
-//		@ApiImplicitParam(paramType = "query", dataType = "float",  required = true, name = "score",         value="评分"),
-//		@ApiImplicitParam(paramType = "query", dataType = "string", required = true, name = "content",       value="选片结论"),
-//	})
-//	public Object doPass(Long film_id, Double score, String content) {
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		Integer round = reviewService.queryRound(user_id, film_id);
-//		reviewService.doPass(user_id, film_id, round, score, content);
-//		return Rjx.jsonOk();
-//	}
-//	
-//	@ResponseBody
-//	@PostMapping("statistics")
-//	@ApiOperation("查询统计数据")
-//	public Object statistics() {
-//		LoginToken loginToken = tokenService.getToken();
-//		Long user_id = (Long)loginToken.getId();
-//		return reviewService.queryStatistics(user_id);
-//	}
-//	
-//}
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.egolm.common.bean.Rjx;
+import com.egolm.common.jdbc.Page;
+import com.egolm.film.api.service.UserReviewService;
+import com.egolm.film.api.service.UserTokenService;
+import com.egolm.film.model.LoginToken;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@Api
+@Controller
+@RequestMapping("user/review")
+public class UserReviewController {
+	
+	@Autowired
+	private UserTokenService tokenService;
+	
+	@Autowired
+	private UserReviewService service;
+
+	@ResponseBody
+	@PostMapping("review_list")
+	@ApiOperation("审核列表")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType = "query", dataType = "date",      required = false, name = "push_date", value="推送日期"),
+		@ApiImplicitParam(paramType = "query", dataType = "int",       required = false, name = "film_type_id", value="影片类型ID"),
+		@ApiImplicitParam(paramType = "query", dataType = "int",       required = false, name = "enroll_type_id", value="申报奖项ID"),
+		@ApiImplicitParam(paramType = "query", dataType = "string",    required = false, name = "keyword", value="模糊匹配关键词"),
+		@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="分页排序", allowMultiple=true),
+	})
+	public Object getReviewList(boolean is_review, Date push_date, Integer film_type_id, Integer enroll_type_id, String keyword, Long index, Long limit, String[] limitKey) {
+		index = index == null ? 1 : index;
+		limit = limit == null ? 20 : limit;
+		LoginToken loginToken = tokenService.getToken();
+		Integer user_id = (Integer)loginToken.getId();
+		Page page = new Page(index, limit, limitKey);
+		List<Map<String, Object>> list = service.queryReviewList(is_review, user_id, push_date, film_type_id, enroll_type_id, keyword, page);
+		return Rjx.jsonOk().setData(list).setPage(page);
+	}
+	
+}

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

@@ -292,11 +292,6 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private Long pass_time;
 
-	/**
-	 * 当前审片是第几轮
-	 */
-	private Integer review_round;
-
 	/**
 	 * 上传影片标记
 	 */
@@ -378,12 +373,11 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param film_district 区域
 	 * @param is_check_director 状态
 	 * @param pass_time 通过时间
-	 * @param review_round 当前审片是第几轮
 	 * @param upload_id 上传影片标记
 	 * @param upload_state 上传影片状态(0上传中,1已完成)
 	 * @param upload_time 上传影片时间
 	 */
-	public Fc_member_film(Long id, Integer film_no, String origion_name, String en_name, String cn_name, Integer type, Long film_group_id, Integer film_type, String film_type_name, String show_date, Long show_time, String first_show_date, String first_show_city, Integer is_apply_other_filmfest, String other_filmfest_name, String film_medium, String film_format, String completion_date, String film_country, String co_production_country, String film_producers, String production_company, String enroll_type_name, Integer enroll_type, Integer is_like_show, Long create_time, Integer member_id, String create_ip, Integer state, String prize, String dialogue_lang, String subtitle_lang, String play_shanghai, String has_joined_award, String intro, String en_intro, Long last_modify_time, String film_side_demand, String film_total_time, Integer is_show, String film_apply_company, String film_apply_realname, String film_apply_email, String film_apply_tel, String film_apply_mobile, String film_apply_country, String enroll_type_name_other, String film_format_url, String film_format_passw, String film_format_other, String film_type_name_short, String lang, Integer apply_state, String film_district, Integer is_check_director, Long pass_time, Integer review_round, String upload_id, Integer upload_state, Date upload_time) {
+	public Fc_member_film(Long id, Integer film_no, String origion_name, String en_name, String cn_name, Integer type, Long film_group_id, Integer film_type, String film_type_name, String show_date, Long show_time, String first_show_date, String first_show_city, Integer is_apply_other_filmfest, String other_filmfest_name, String film_medium, String film_format, String completion_date, String film_country, String co_production_country, String film_producers, String production_company, String enroll_type_name, Integer enroll_type, Integer is_like_show, Long create_time, Integer member_id, String create_ip, Integer state, String prize, String dialogue_lang, String subtitle_lang, String play_shanghai, String has_joined_award, String intro, String en_intro, Long last_modify_time, String film_side_demand, String film_total_time, Integer is_show, String film_apply_company, String film_apply_realname, String film_apply_email, String film_apply_tel, String film_apply_mobile, String film_apply_country, String enroll_type_name_other, String film_format_url, String film_format_passw, String film_format_other, String film_type_name_short, String lang, Integer apply_state, String film_district, Integer is_check_director, Long pass_time, String upload_id, Integer upload_state, Date upload_time) {
 		this.id = id;
 		this.film_no = film_no;
 		this.origion_name = origion_name;
@@ -440,7 +434,6 @@ public class Fc_member_film implements java.io.Serializable {
 		this.film_district = film_district;
 		this.is_check_director = is_check_director;
 		this.pass_time = pass_time;
-		this.review_round = review_round;
 		this.upload_id = upload_id;
 		this.upload_state = upload_state;
 		this.upload_time = upload_time;
@@ -894,14 +887,6 @@ public class Fc_member_film implements java.io.Serializable {
 		return pass_time;
 	}
 
-	public void setReview_round(Integer review_round) {
-		this.review_round = review_round;
-	}
-
-	public Integer getReview_round() {
-		return review_round;
-	}
-
 	public void setUpload_id(String upload_id) {
 		this.upload_id = upload_id;
 	}

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

@@ -18,6 +18,8 @@ public class Fc_member_film_enroll implements java.io.Serializable {
 	@Id
 	private Integer enroll_type_id;
 
+	private Integer review_round;
+
 
 	/**
 	 * 无参数构造方法
@@ -30,10 +32,12 @@ public class Fc_member_film_enroll implements java.io.Serializable {
 	 * 全参数构造方法
 	 * @param film_id 
 	 * @param enroll_type_id 
+	 * @param review_round 
 	 */
-	public Fc_member_film_enroll(Integer film_id, Integer enroll_type_id) {
+	public Fc_member_film_enroll(Integer film_id, Integer enroll_type_id, Integer review_round) {
 		this.film_id = film_id;
 		this.enroll_type_id = enroll_type_id;
+		this.review_round = review_round;
 	}
 
 	public void setFilm_id(Integer film_id) {
@@ -52,5 +56,13 @@ public class Fc_member_film_enroll implements java.io.Serializable {
 		return enroll_type_id;
 	}
 
+	public void setReview_round(Integer review_round) {
+		this.review_round = review_round;
+	}
+
+	public Integer getReview_round() {
+		return review_round;
+	}
+
 }
 

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

@@ -4,6 +4,8 @@ import javax.persistence.Entity;
 
 import javax.persistence.Id;
 
+import java.util.Date;
+
 /**
  * @author 曲欣亮
  */
@@ -24,20 +26,27 @@ public class Fc_review implements java.io.Serializable {
 	private Integer film_id;
 
 	/**
-	 * 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
+	 * 影片性质(申报奖项)ID
 	 */
-	private Integer review_state;
+	private Integer enroll_type_id;
 
 	/**
 	 * 审片轮数,第几轮审片
 	 */
 	private Integer review_round;
 
+	/**
+	 * 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
+	 */
+	private Integer review_state;
+
 	/**
 	 * 审片结论
 	 */
 	private String result_text;
 
+	private Date create_time;
+
 
 	/**
 	 * 无参数构造方法
@@ -50,16 +59,20 @@ public class Fc_review implements java.io.Serializable {
 	 * 全参数构造方法
 	 * @param id 审片记录ID
 	 * @param film_id 参审影片ID
-	 * @param review_state 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
+	 * @param enroll_type_id 影片性质(申报奖项)ID
 	 * @param review_round 审片轮数,第几轮审片
+	 * @param review_state 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
 	 * @param result_text 审片结论
+	 * @param create_time 
 	 */
-	public Fc_review(Integer id, Integer film_id, Integer review_state, Integer review_round, String result_text) {
+	public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer review_state, String result_text, Date create_time) {
 		this.id = id;
 		this.film_id = film_id;
-		this.review_state = review_state;
+		this.enroll_type_id = enroll_type_id;
 		this.review_round = review_round;
+		this.review_state = review_state;
 		this.result_text = result_text;
+		this.create_time = create_time;
 	}
 
 	public void setId(Integer id) {
@@ -78,12 +91,12 @@ public class Fc_review implements java.io.Serializable {
 		return film_id;
 	}
 
-	public void setReview_state(Integer review_state) {
-		this.review_state = review_state;
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
 	}
 
-	public Integer getReview_state() {
-		return review_state;
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
 	}
 
 	public void setReview_round(Integer review_round) {
@@ -94,6 +107,14 @@ public class Fc_review implements java.io.Serializable {
 		return review_round;
 	}
 
+	public void setReview_state(Integer review_state) {
+		this.review_state = review_state;
+	}
+
+	public Integer getReview_state() {
+		return review_state;
+	}
+
 	public void setResult_text(String result_text) {
 		this.result_text = result_text;
 	}
@@ -102,5 +123,13 @@ public class Fc_review implements java.io.Serializable {
 		return result_text;
 	}
 
+	public void setCreate_time(Date create_time) {
+		this.create_time = create_time;
+	}
+
+	public Date getCreate_time() {
+		return create_time;
+	}
+
 }
 

src/main/java/com/egolm/film/bean/Fc_review_user_result_ext.java → src/main/java/com/egolm/film/bean/Fc_review_doubtful.java

@@ -4,59 +4,82 @@ import javax.persistence.Entity;
 
 import javax.persistence.Id;
 
+import java.util.Date;
+
 /**
  * @author 曲欣亮
  */
-@Entity(name="fc_review_user_result_ext")
-public class Fc_review_user_result_ext implements java.io.Serializable {
+@Entity(name="fc_review_doubtful")
+public class Fc_review_doubtful implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	@Id
 	private Integer id;
 
+	/**
+	 * 影片ID
+	 */
 	private Integer film_id;
 
+	/**
+	 * 影片性质
+	 */
+	private Integer enroll_type_id;
+
+	/**
+	 * 第几轮审核
+	 */
 	private Integer review_round;
 
+	/**
+	 * 评委ID
+	 */
 	private Integer user_id;
 
-	private Integer result_id;
-
-	private Integer enroll_type_id;
-
-	private Double enroll_score;
+	/**
+	 * 疑点类型
+	 */
+	private Integer doubtful_type_id;
 
+	/**
+	 * 疑点介绍
+	 */
 	private String review_text;
 
+	/**
+	 * 疑点时间
+	 */
+	private Date play_time;
+
 
 	/**
 	 * 无参数构造方法
 	 */
-	public Fc_review_user_result_ext () {
+	public Fc_review_doubtful () {
 		super();
 	}
 
 	/**
 	 * 全参数构造方法
 	 * @param id 
-	 * @param film_id 
-	 * @param review_round 
-	 * @param user_id 
-	 * @param result_id 
-	 * @param enroll_type_id 
-	 * @param enroll_score 
-	 * @param review_text 
+	 * @param film_id 影片ID
+	 * @param enroll_type_id 影片性质
+	 * @param review_round 第几轮审核
+	 * @param user_id 评委ID
+	 * @param doubtful_type_id 疑点类型
+	 * @param review_text 疑点介绍
+	 * @param play_time 疑点时间
 	 */
-	public Fc_review_user_result_ext(Integer id, Integer film_id, Integer review_round, Integer user_id, Integer result_id, Integer enroll_type_id, Double enroll_score, String review_text) {
+	public Fc_review_doubtful(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer user_id, Integer doubtful_type_id, String review_text, Date play_time) {
 		this.id = id;
 		this.film_id = film_id;
+		this.enroll_type_id = enroll_type_id;
 		this.review_round = review_round;
 		this.user_id = user_id;
-		this.result_id = result_id;
-		this.enroll_type_id = enroll_type_id;
-		this.enroll_score = enroll_score;
+		this.doubtful_type_id = doubtful_type_id;
 		this.review_text = review_text;
+		this.play_time = play_time;
 	}
 
 	public void setId(Integer id) {
@@ -75,6 +98,14 @@ public class Fc_review_user_result_ext implements java.io.Serializable {
 		return film_id;
 	}
 
+	public void setEnroll_type_id(Integer enroll_type_id) {
+		this.enroll_type_id = enroll_type_id;
+	}
+
+	public Integer getEnroll_type_id() {
+		return enroll_type_id;
+	}
+
 	public void setReview_round(Integer review_round) {
 		this.review_round = review_round;
 	}
@@ -91,28 +122,12 @@ public class Fc_review_user_result_ext implements java.io.Serializable {
 		return user_id;
 	}
 
-	public void setResult_id(Integer result_id) {
-		this.result_id = result_id;
-	}
-
-	public Integer getResult_id() {
-		return result_id;
+	public void setDoubtful_type_id(Integer doubtful_type_id) {
+		this.doubtful_type_id = doubtful_type_id;
 	}
 
-	public void setEnroll_type_id(Integer enroll_type_id) {
-		this.enroll_type_id = enroll_type_id;
-	}
-
-	public Integer getEnroll_type_id() {
-		return enroll_type_id;
-	}
-
-	public void setEnroll_score(Double enroll_score) {
-		this.enroll_score = enroll_score;
-	}
-
-	public Double getEnroll_score() {
-		return enroll_score;
+	public Integer getDoubtful_type_id() {
+		return doubtful_type_id;
 	}
 
 	public void setReview_text(String review_text) {
@@ -123,5 +138,13 @@ public class Fc_review_user_result_ext implements java.io.Serializable {
 		return review_text;
 	}
 
+	public void setPlay_time(Date play_time) {
+		this.play_time = play_time;
+	}
+
+	public Date getPlay_time() {
+		return play_time;
+	}
+
 }
 

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

@@ -12,17 +12,13 @@ public class Fc_review_user implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 影片ID
-	 */
 	@Id
-	private Integer film_id;
+	private Integer id;
 
 	/**
-	 * 审片环节
+	 * 审片记录ID
 	 */
-	@Id
-	private Integer review_round;
+	private Integer review_id;
 
 	/**
 	 * 评委ID
@@ -30,10 +26,45 @@ public class Fc_review_user implements java.io.Serializable {
 	private Integer user_id;
 
 	/**
-	 * 是否观看 0否,1是
+	 * 0未观看,1已观看
 	 */
 	private Integer view_state;
 
+	/**
+	 * 2通过,3否决,4参赛,5参赛备选,6参展
+	 */
+	private Integer review_state;
+
+	/**
+	 * 得分分数
+	 */
+	private Double review_score;
+
+	/**
+	 * 影片评论
+	 */
+	private String review_text;
+
+	/**
+	 * 影片概述
+	 */
+	private String review_text_summary;
+
+	/**
+	 * 叙事/题材
+	 */
+	private String review_text_theme;
+
+	/**
+	 * 风格/美学
+	 */
+	private String review_text_style;
+
+	/**
+	 * 突出/优缺点
+	 */
+	private String review_text_keynote;
+
 
 	/**
 	 * 无参数构造方法
@@ -44,32 +75,46 @@ public class Fc_review_user implements java.io.Serializable {
 
 	/**
 	 * 全参数构造方法
-	 * @param film_id 影片ID
-	 * @param review_round 审片环节
+	 * @param id 
+	 * @param review_id 审片记录ID
 	 * @param user_id 评委ID
-	 * @param view_state 是否观看 0否,1是
+	 * @param view_state 0未观看,1已观看
+	 * @param review_state 2通过,3否决,4参赛,5参赛备选,6参展
+	 * @param review_score 得分分数
+	 * @param review_text 影片评论
+	 * @param review_text_summary 影片概述
+	 * @param review_text_theme 叙事/题材
+	 * @param review_text_style 风格/美学
+	 * @param review_text_keynote 突出/优缺点
 	 */
-	public Fc_review_user(Integer film_id, Integer review_round, Integer user_id, Integer view_state) {
-		this.film_id = film_id;
-		this.review_round = review_round;
+	public Fc_review_user(Integer id, Integer review_id, Integer user_id, Integer view_state, Integer review_state, Double review_score, String review_text, String review_text_summary, String review_text_theme, String review_text_style, String review_text_keynote) {
+		this.id = id;
+		this.review_id = review_id;
 		this.user_id = user_id;
 		this.view_state = view_state;
+		this.review_state = review_state;
+		this.review_score = review_score;
+		this.review_text = review_text;
+		this.review_text_summary = review_text_summary;
+		this.review_text_theme = review_text_theme;
+		this.review_text_style = review_text_style;
+		this.review_text_keynote = review_text_keynote;
 	}
 
-	public void setFilm_id(Integer film_id) {
-		this.film_id = film_id;
+	public void setId(Integer id) {
+		this.id = id;
 	}
 
-	public Integer getFilm_id() {
-		return film_id;
+	public Integer getId() {
+		return id;
 	}
 
-	public void setReview_round(Integer review_round) {
-		this.review_round = review_round;
+	public void setReview_id(Integer review_id) {
+		this.review_id = review_id;
 	}
 
-	public Integer getReview_round() {
-		return review_round;
+	public Integer getReview_id() {
+		return review_id;
 	}
 
 	public void setUser_id(Integer user_id) {
@@ -88,5 +133,61 @@ public class Fc_review_user implements java.io.Serializable {
 		return view_state;
 	}
 
+	public void setReview_state(Integer review_state) {
+		this.review_state = review_state;
+	}
+
+	public Integer getReview_state() {
+		return review_state;
+	}
+
+	public void setReview_score(Double review_score) {
+		this.review_score = review_score;
+	}
+
+	public Double getReview_score() {
+		return review_score;
+	}
+
+	public void setReview_text(String review_text) {
+		this.review_text = review_text;
+	}
+
+	public String getReview_text() {
+		return review_text;
+	}
+
+	public void setReview_text_summary(String review_text_summary) {
+		this.review_text_summary = review_text_summary;
+	}
+
+	public String getReview_text_summary() {
+		return review_text_summary;
+	}
+
+	public void setReview_text_theme(String review_text_theme) {
+		this.review_text_theme = review_text_theme;
+	}
+
+	public String getReview_text_theme() {
+		return review_text_theme;
+	}
+
+	public void setReview_text_style(String review_text_style) {
+		this.review_text_style = review_text_style;
+	}
+
+	public String getReview_text_style() {
+		return review_text_style;
+	}
+
+	public void setReview_text_keynote(String review_text_keynote) {
+		this.review_text_keynote = review_text_keynote;
+	}
+
+	public String getReview_text_keynote() {
+		return review_text_keynote;
+	}
+
 }
 

src/main/java/com/egolm/film/bean/Fc_review_user_result_doubtful.java → src/main/java/com/egolm/film/bean/Fc_review_user_ext.java

@@ -7,47 +7,62 @@ import javax.persistence.Id;
 /**
  * @author 曲欣亮
  */
-@Entity(name="fc_review_user_result_doubtful")
-public class Fc_review_user_result_doubtful implements java.io.Serializable {
+@Entity(name="fc_review_user_ext")
+public class Fc_review_user_ext implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	@Id
 	private Integer id;
 
-	private Integer film_id;
-
-	private Integer review_round;
+	/**
+	 * 总审片记录ID
+	 */
+	private Integer review_id;
 
+	/**
+	 * 评委ID
+	 */
 	private Integer user_id;
 
-	private Integer result_id;
+	/**
+	 * 影片申报奖项ID
+	 */
+	private Integer enroll_ext_id;
+
+	/**
+	 * 影片申报奖项评分
+	 */
+	private Double enroll_ext_score;
 
+	/**
+	 * 评委审片结论
+	 */
 	private String review_text;
 
 
 	/**
 	 * 无参数构造方法
 	 */
-	public Fc_review_user_result_doubtful () {
+	public Fc_review_user_ext () {
 		super();
 	}
 
 	/**
 	 * 全参数构造方法
 	 * @param id 
-	 * @param film_id 
-	 * @param review_round 
-	 * @param user_id 
-	 * @param result_id 
-	 * @param review_text 
+	 * @param review_id 总审片记录ID
+	 * @param user_id 评委ID
+	 * @param enroll_ext_id 影片申报奖项ID
+	 * @param enroll_ext_score 影片申报奖项评分
+	 * @param review_text 评委审片结论
 	 */
-	public Fc_review_user_result_doubtful(Integer id, Integer film_id, Integer review_round, Integer user_id, Integer result_id, String review_text) {
+	public Fc_review_user_ext(Integer id, Integer review_id, Integer user_id, Integer enroll_ext_id, Double enroll_ext_score, String review_text) {
 		this.id = id;
-		this.film_id = film_id;
-		this.review_round = review_round;
+		this.review_id = review_id;
 		this.user_id = user_id;
-		this.result_id = result_id;
+		this.enroll_ext_id = enroll_ext_id;
+		this.enroll_ext_score = enroll_ext_score;
 		this.review_text = review_text;
 	}
 
@@ -59,20 +74,12 @@ public class Fc_review_user_result_doubtful implements java.io.Serializable {
 		return id;
 	}
 
-	public void setFilm_id(Integer film_id) {
-		this.film_id = film_id;
-	}
-
-	public Integer getFilm_id() {
-		return film_id;
-	}
-
-	public void setReview_round(Integer review_round) {
-		this.review_round = review_round;
+	public void setReview_id(Integer review_id) {
+		this.review_id = review_id;
 	}
 
-	public Integer getReview_round() {
-		return review_round;
+	public Integer getReview_id() {
+		return review_id;
 	}
 
 	public void setUser_id(Integer user_id) {
@@ -83,12 +90,20 @@ public class Fc_review_user_result_doubtful implements java.io.Serializable {
 		return user_id;
 	}
 
-	public void setResult_id(Integer result_id) {
-		this.result_id = result_id;
+	public void setEnroll_ext_id(Integer enroll_ext_id) {
+		this.enroll_ext_id = enroll_ext_id;
+	}
+
+	public Integer getEnroll_ext_id() {
+		return enroll_ext_id;
+	}
+
+	public void setEnroll_ext_score(Double enroll_ext_score) {
+		this.enroll_ext_score = enroll_ext_score;
 	}
 
-	public Integer getResult_id() {
-		return result_id;
+	public Double getEnroll_ext_score() {
+		return enroll_ext_score;
 	}
 
 	public void setReview_text(String review_text) {

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

-package com.egolm.film.bean;
-
-import javax.persistence.Entity;
-
-import javax.persistence.Id;
-
-/**
- * @author 曲欣亮
- */
-@Entity(name="fc_review_user_result")
-public class Fc_review_user_result implements java.io.Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	private Integer id;
-
-	private Integer film_id;
-
-	private Integer user_id;
-
-	private Integer review_id;
-
-	private Integer review_round;
-
-	/**
-	 * 2通过,3否决,4参赛,5参赛备选,6参展
-	 */
-	private Integer review_state;
-
-	/**
-	 * 得分分数
-	 */
-	private Double review_score;
-
-	/**
-	 * 影片评论
-	 */
-	private String review_text;
-
-	/**
-	 * 影片概述
-	 */
-	private String review_text_summary;
-
-	/**
-	 * 叙事/题材
-	 */
-	private String review_text_theme;
-
-	/**
-	 * 风格/美学
-	 */
-	private String review_text_style;
-
-	/**
-	 * 突出/优缺点
-	 */
-	private String review_text_keynote;
-
-
-	/**
-	 * 无参数构造方法
-	 */
-	public Fc_review_user_result () {
-		super();
-	}
-
-	/**
-	 * 全参数构造方法
-	 * @param id 
-	 * @param film_id 
-	 * @param user_id 
-	 * @param review_id 
-	 * @param review_round 
-	 * @param review_state 2通过,3否决,4参赛,5参赛备选,6参展
-	 * @param review_score 得分分数
-	 * @param review_text 影片评论
-	 * @param review_text_summary 影片概述
-	 * @param review_text_theme 叙事/题材
-	 * @param review_text_style 风格/美学
-	 * @param review_text_keynote 突出/优缺点
-	 */
-	public Fc_review_user_result(Integer id, Integer film_id, Integer user_id, Integer review_id, Integer review_round, Integer review_state, Double review_score, String review_text, String review_text_summary, String review_text_theme, String review_text_style, String review_text_keynote) {
-		this.id = id;
-		this.film_id = film_id;
-		this.user_id = user_id;
-		this.review_id = review_id;
-		this.review_round = review_round;
-		this.review_state = review_state;
-		this.review_score = review_score;
-		this.review_text = review_text;
-		this.review_text_summary = review_text_summary;
-		this.review_text_theme = review_text_theme;
-		this.review_text_style = review_text_style;
-		this.review_text_keynote = review_text_keynote;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setFilm_id(Integer film_id) {
-		this.film_id = film_id;
-	}
-
-	public Integer getFilm_id() {
-		return film_id;
-	}
-
-	public void setUser_id(Integer user_id) {
-		this.user_id = user_id;
-	}
-
-	public Integer getUser_id() {
-		return user_id;
-	}
-
-	public void setReview_id(Integer review_id) {
-		this.review_id = review_id;
-	}
-
-	public Integer getReview_id() {
-		return review_id;
-	}
-
-	public void setReview_round(Integer review_round) {
-		this.review_round = review_round;
-	}
-
-	public Integer getReview_round() {
-		return review_round;
-	}
-
-	public void setReview_state(Integer review_state) {
-		this.review_state = review_state;
-	}
-
-	public Integer getReview_state() {
-		return review_state;
-	}
-
-	public void setReview_score(Double review_score) {
-		this.review_score = review_score;
-	}
-
-	public Double getReview_score() {
-		return review_score;
-	}
-
-	public void setReview_text(String review_text) {
-		this.review_text = review_text;
-	}
-
-	public String getReview_text() {
-		return review_text;
-	}
-
-	public void setReview_text_summary(String review_text_summary) {
-		this.review_text_summary = review_text_summary;
-	}
-
-	public String getReview_text_summary() {
-		return review_text_summary;
-	}
-
-	public void setReview_text_theme(String review_text_theme) {
-		this.review_text_theme = review_text_theme;
-	}
-
-	public String getReview_text_theme() {
-		return review_text_theme;
-	}
-
-	public void setReview_text_style(String review_text_style) {
-		this.review_text_style = review_text_style;
-	}
-
-	public String getReview_text_style() {
-		return review_text_style;
-	}
-
-	public void setReview_text_keynote(String review_text_keynote) {
-		this.review_text_keynote = review_text_keynote;
-	}
-
-	public String getReview_text_keynote() {
-		return review_text_keynote;
-	}
-
-}
-

src/main/java/com/egolm/film/util/SqlWhere.java

@@ -18,8 +18,10 @@ public class SqlWhere {
 	public SqlWhere where(String where, Object[] obj) {
 		if(StringUtil.isNotBlank(where)) {
 			this.strList.add(where);
-			for(Object o : obj) {
-				this.objList.add(o);
+			if(obj != null){
+				for(Object o : obj) {
+					this.objList.add(o);
+				}
 			}
 		}
 		return this;