x

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

@@ -400,8 +400,8 @@ public class FilmServiceImpl implements FilmService {
 
 	@Override
 	public void pass(Long member_film_id) {
-		String sql = "update fc_member_film set apply_state = ? where id = ?";
-		jdbcTemplate.executeUpdate(sql, 2, member_film_id);
+		String sql = "update fc_member_film set apply_state = ?, pass_time = ? where id = ?";
+		jdbcTemplate.executeUpdate(sql, 2, System.currentTimeMillis()/1000L, member_film_id);
 	}
 
 	@Override

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

@@ -85,9 +85,14 @@ public class AdminFirstController {
 	@PostMapping("pass")
 	@ApiOperation("初审通过")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="long", required=false, name="member_film_id", value="申报影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id", value="申报影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_type_ext", value="申报影片ID"),
 	})
-	public Object pass(Long member_film_id) {
+	public Object pass(Long member_film_id, String film_type_name_short) {
+		memberFilmService.pass(member_film_id);
+		Fc_member_film film = new Fc_member_film();
+		film.setId(member_film_id);
+		film.setFilm_type_name_short(film_type_name_short);
 		memberFilmService.pass(member_film_id);
 		return Rjx.jsonOk();
 	}
@@ -96,7 +101,7 @@ public class AdminFirstController {
 	@PostMapping("reject")
 	@ApiOperation("初审拒绝")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="long", required=false, name="member_film_id", value="申报影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="long", required=true, name="member_film_id", value="申报影片ID"),
 	})
 	public Object reject(Long member_film_id) {
 		memberFilmService.reject(member_film_id);

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin")
 public class Fc_admin implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_group")
 public class Fc_admin_group implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_group_filmtype")
 public class Fc_admin_group_filmtype implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_group_menu")
 public class Fc_admin_group_menu implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_admin_menu")
 public class Fc_admin_menu implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_enroll_type")
 public class Fc_enroll_type implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_film_enroll")
 public class Fc_film_enroll implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_film_type")
 public class Fc_film_type implements java.io.Serializable {

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

@@ -8,8 +8,6 @@ import java.util.Date;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_logs")
 public class Fc_logs implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_logs_ext")
 public class Fc_logs_ext implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member")
 public class Fc_member implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film")
 public class Fc_member_film implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_all")
 public class Fc_member_film_all implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_issuer")
 public class Fc_member_film_issuer implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_playactor")
 public class Fc_member_film_playactor implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_member_film_show")
 public class Fc_member_film_show implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_user")
 public class Fc_user implements java.io.Serializable {

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

@@ -6,8 +6,6 @@ import javax.persistence.Id;
 
 /**
  * @author 曲欣亮
- * @since 2018-11-23
- * @version v-1.0
  */
 @Entity(name="fc_user_group")
 public class Fc_user_group implements java.io.Serializable {