xx

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

@@ -49,7 +49,7 @@ public class AdminAuthController {
 	@ApiOperation("管理员分页查询")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",   value="关键字"),
-		@ApiImplicitParam(paramType="query", dataType="integer", required=false, name="group_id",  value="组ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="group_id",  value="组ID"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",     value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",     value="分页大小"),
 	})
@@ -69,7 +69,7 @@ public class AdminAuthController {
 		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="realname",  value="姓名"),
 		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="username",  value="用户名"),
 		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="password",  value="密码"),
-		@ApiImplicitParam(paramType="query", dataType="integer", required=true,  name="group_id",  value="组ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="group_id",  value="组ID"),
 	})
 	public Object adminSave(String realname, String username, String password, Integer group_id) {
 		String remoteIp = WebMvcConfig.getRemoteIp();
@@ -97,7 +97,7 @@ public class AdminAuthController {
 		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="realname",  value="姓名"),
 		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="username",  value="用户名"),
 		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="password",  value="密码"),
-		@ApiImplicitParam(paramType="query", dataType="integer", required=true,  name="group_id",  value="组ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=true,  name="group_id",  value="组ID"),
 	})
 	public Object adminUpdate(Integer adminid, String realname, String username, String password, Integer group_id) {
 		XException.assertNotBlank("管理员ID不能为空", adminid);
@@ -123,7 +123,7 @@ public class AdminAuthController {
 	@PostMapping("adminDilabled")
 	@ApiOperation("禁用管理员")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="integer",  required=true,  name="adminid",   value="管理员ID", allowMultiple=true),
+		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  name="adminid",   value="管理员ID", allowMultiple=true),
 	})
 	public Object adminDilabled(Integer[] adminid) {
 		XException.assertNotBlank("管理员ID不能为空", (Object[])adminid);
@@ -161,7 +161,7 @@ public class AdminAuthController {
 	@PostMapping("groupAuth")
 	@ApiOperation("管理组权限查询")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="integer",  required=true,  name="group_id",   value="组ID"),
+		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  name="group_id",   value="组ID"),
 	})
 	public Object groupAuth(Integer group_id) throws FileNotFoundException {
 		String json = service.queryGroupAuth(group_id);

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

@@ -40,18 +40,19 @@ public class AdminFirstController {
 	@ApiOperation("初审列表分页查询")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",     value="关键字"),
-		@ApiImplicitParam(paramType="query", dataType="integer", required=false, name="apply_state", value="状态"),
-		@ApiImplicitParam(paramType="query", dataType="integer", required=false, name="film_type",   value="影片类型"),
-		@ApiImplicitParam(paramType="query", dataType="integer", required=false, name="enroll_type", value="影片性质"),
+		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="state",       value="影片状态[state=1 未提交, state=2 已提交, apply_state=1 未初审, apply_state=2 初审通过, apply_state=3 初审未通过]"),
+		@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="long",    required=true,  name="index",       value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
 	})
-	public Object list(String keyword, Integer apply_state, String film_type, String enroll_type, Long index, Long limit) {
+	public Object list(String keyword, Integer state, String film_type, String enroll_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 = memberService.queryChuShenList(keyword, apply_state, film_type, enroll_type, page);
+		List<Map<String, Object>> list = memberService.queryChuShenList(keyword, state, film_type, enroll_type, page);
 		return Rjx.jsonOk().setData(list);
 	}
 	
+	
 }

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

@@ -496,8 +496,8 @@ public class MemberServiceImpl implements MemberService {
 	}
 
 	@Override
-	public List<Map<String, Object>> queryChuShenList(String keyword, Integer apply_state, String film_type, String enroll_type, Page page) {
-		SqlWhere where = new SqlWhere().olike(new String[]{"en_name", "cn_name"}, keyword).eq("state", 2).eq("apply_state", apply_state).eq("film_type", film_type).eq("enroll_type", enroll_type);
+	public List<Map<String, Object>> queryChuShenList(String keyword, Integer state, String film_type, String enroll_type, Page page) {
+		SqlWhere where = new SqlWhere().olike(new String[]{"en_name", "cn_name"}, keyword).eq("state", state).eq("apply_state", 1).eq("film_type", film_type).eq("enroll_type", enroll_type);
 		String sql = "select * from fc_member_film" + StringUtil.join(" and ", " where ", "", "", where.getStringList());
 		Object[] objs = where.getObjectList();
 		return jdbcTemplate.limit(sql, page, objs);