x

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 {
-//
-//	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);
-//
-//}
+
+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(Date push_date, Integer film_type_id, Integer enroll_type_id,	String keyword, Page page);
+	
+}
\ No newline at end of file

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

@@ -45,7 +45,7 @@ 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 = ?, login_ip, login_time where 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);
 						}

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

@@ -472,6 +472,7 @@ public class FilmServiceImpl implements FilmService {
 			review.setFilm_id(member_film_id.intValue());
 			review.setReview_round(nextRound);
 			review.setReview_state(0);
+			review.setCreate_time(new Date());
 			jdbcTemplate.save(review);
 		}
 	}

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/bean/Fc_review.java

@@ -4,6 +4,8 @@ import javax.persistence.Entity;
 
 import javax.persistence.Id;
 
+import java.util.Date;
+
 /**
  * @author 曲欣亮
  */
@@ -38,6 +40,8 @@ public class Fc_review implements java.io.Serializable {
 	 */
 	private String result_text;
 
+	private Date create_time;
+
 
 	/**
 	 * 无参数构造方法
@@ -53,13 +57,15 @@ public class Fc_review implements java.io.Serializable {
 	 * @param review_state 审片状态 0未分配评委,1已分配评委评选中,2通过,3否决,4参赛,5参赛备选,6参展
 	 * @param review_round 审片轮数,第几轮审片
 	 * @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 review_state, Integer review_round, String result_text, Date create_time) {
 		this.id = id;
 		this.film_id = film_id;
 		this.review_state = review_state;
 		this.review_round = review_round;
 		this.result_text = result_text;
+		this.create_time = create_time;
 	}
 
 	public void setId(Integer id) {
@@ -102,5 +108,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;
+	}
+
 }