x

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

@@ -111,7 +111,7 @@ public interface FilmService {
 
 	Integer pass(Long member_film_id);
 
-	void reject(Long member_film_id, String apply_state_intro);
+	void reject(Boolean is_stop_apply, Long member_film_id, String apply_state_intro);
 
 	Fc_member_film queryMemberFilmById(Long member_film_id);
 

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

@@ -478,9 +478,14 @@ public class FilmServiceImpl implements FilmService {
 	}
 
 	@Override
-	public void reject(Long member_film_id, String apply_state_intro) {
-		String sql = "update fc_member_film set state = ?, pass_time = ?, apply_state = ?, apply_state_intro = ? where id = ?";
-		jdbcTemplate.executeUpdate(sql, 1, System.currentTimeMillis()/1000L, 3, apply_state_intro, member_film_id);
+	public void reject(Boolean is_stop_apply, Long member_film_id, String apply_state_intro) {
+		if(is_stop_apply) {
+			String sql = "update fc_member_film pass_time = ?, apply_state = 3, apply_state_intro = ? where id = ?";
+			jdbcTemplate.executeUpdate(sql, System.currentTimeMillis()/1000L, apply_state_intro, member_film_id);
+		} else {
+			String sql = "update fc_member_film pass_time = ?, state = 1, apply_state = 1, apply_state_intro = ? where id = ?";
+			jdbcTemplate.executeUpdate(sql, System.currentTimeMillis()/1000L, apply_state_intro, member_film_id);
+		}
 	}
 
 	@Override

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

@@ -82,16 +82,38 @@ public class AdminFirstController {
 	@PostMapping("pass_list")
 	@ApiOperation("初审通过列表")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",     value="关键字"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type",   value="影片类型"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="film_type_short"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="enroll_type", value="影片性质"),
-		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="film_country",value="影片国家地区"),
-		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="upload_state",value="影片文件上传状态(0,1)"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",         value="关键字"),
+		@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="r_state",       value="评选状态 0未评选 1有争议 2管理员分配 3已完成"),
+		
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",       value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
 	})
-	public Object pass_list(String keyword, Integer film_type, Integer enroll_type, Integer upload_state, String film_country, Integer film_type_short, Long index, Long limit) {
+	public Object pass_list(
+			String keyword, 
+			Integer film_type, 
+			Integer enroll_type, 
+			Integer upload_state, 
+			String film_country, 
+			Integer film_type_short, 
+			
+			String play_shanghai, 
+			Integer review_round, 
+			Integer review_state, 
+			Integer allot_atate, 
+			Integer r_state, 
+			
+			Long index, 
+			Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
@@ -140,14 +162,18 @@ public class AdminFirstController {
 	
 	@ResponseBody
 	@PostMapping("reject")
-	@ApiOperation("初审拒绝")
+	@ApiOperation("初审驳回")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id", value="申报影片ID"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="apply_state_intro", value="拒绝理由,初审结论"),
+		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="member_film_id",    value="申报影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="apply_state_intro", value="拒绝理由,初审结论"),
+		@ApiImplicitParam(paramType="query", dataType="boolean", required=false, name="is_stop_apply",     value="true否决 false驳回"),
 	})
-	public Object reject(Long member_film_id, String apply_state_intro) {
+	public Object reject(Boolean is_stop_apply, Long member_film_id, String apply_state_intro) {
+		if(is_stop_apply == null) {
+			is_stop_apply = false;
+		}
 		memberFilmService.verifyFilmDuplicate(member_film_id);
-		memberFilmService.reject(member_film_id, apply_state_intro);
+		memberFilmService.reject(is_stop_apply, member_film_id, apply_state_intro);
 		return Rjx.jsonOk();
 	}