xx

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

@@ -29,11 +29,12 @@ public class FilmController {
 	
 	@Autowired
 	FilmService memberFilmService;
-
+	
 	@ResponseBody
 	@PostMapping("get_detail")
 	@ApiOperation("获取全部申报信息")
 	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
 		@ApiImplicitParam(paramType="query", dataType="long", required=true, name="member_film_id", value="申报影片ID")
 	})
 	public Object getDetail(Long member_film_id) {
@@ -41,13 +42,14 @@ public class FilmController {
 		List<Fc_member_film_issuer> issuerList = memberFilmService.queryMemberFilmIssuerList(memberFilm.getId());
 		List<Fc_member_film_playactor> playactorList = memberFilmService.queryMemberFilmPlayactorList(memberFilm.getId());
 		List<Fc_member_film_show> showList = memberFilmService.queryMemberFilmShowList(memberFilm.getId());
+		
 		return Rjx.jsonOk()
 				.setData(memberFilm)
 				.set("issuerList", issuerList)
 				.set("playactorList", playactorList)
 				.set("showList", showList);
 	}
-	
+
 	@Transactional
 	@ResponseBody
 	@PostMapping("save_show")

src/main/java/com/egolm/film/api/web/member/MemberApplyController.java

@@ -14,11 +14,7 @@ import com.egolm.common.bean.Rjx;
 import com.egolm.film.api.service.FilmService;
 import com.egolm.film.api.service.MemberService;
 import com.egolm.film.api.service.MemberTokenService;
-import com.egolm.film.bean.Fc_member_film;
 import com.egolm.film.bean.Fc_member_film_all;
-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;
@@ -210,26 +206,6 @@ public class MemberApplyController {
 		return Rjx.jsonOk();
 	}
 	
-	@ResponseBody
-	@PostMapping("get_detail")
-	@ApiOperation("获取全部申报信息")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
-		@ApiImplicitParam(paramType="query", dataType="long", required=true, name="member_film_id", value="申报影片ID")
-	})
-	public Object getDetail(Long member_film_id) {
-		Fc_member_film memberFilm = memberFilmService.queryMemberFilmById(member_film_id);
-		List<Fc_member_film_issuer> issuerList = memberFilmService.queryMemberFilmIssuerList(memberFilm.getId());
-		List<Fc_member_film_playactor> playactorList = memberFilmService.queryMemberFilmPlayactorList(memberFilm.getId());
-		List<Fc_member_film_show> showList = memberFilmService.queryMemberFilmShowList(memberFilm.getId());
-		
-		return Rjx.jsonOk()
-				.setData(memberFilm)
-				.set("issuerList", issuerList)
-				.set("playactorList", playactorList)
-				.set("showList", showList);
-	}
-	
 	@ResponseBody
 	@PostMapping("do_apply")
 	@ApiOperation("提交申报")