x

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

@@ -21,4 +21,8 @@ public interface FilmGroupService {
 			Integer film_type_name_short, Integer play_shanghai, Integer is_important, Integer review_state, Integer review_round,
 			String film_country, Page page);
 
+	List<Map<String, Object>> queryNotInviteList(Integer[] group_id, String keyword, Integer enroll_type_id,
+			Integer film_type_name, Integer film_type_name_short, Integer play_shanghai, Integer is_important,
+			Integer review_state, Integer review_round, String film_country, Page page);
+
 }

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

@@ -81,7 +81,7 @@ public class FilmGroupServiceImpl implements FilmGroupService {
 				+ "select "
 					+ "t.* "
 				+ "from "
-					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and (t.film_group_id is null or t.film_group_id = 0) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
+					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and (t.film_group_id is null or t.film_group_id = 0) and (t.not_invite is null or t.not_invite = 0) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
 		return jdbcTemplate.limit(sql, page, wehre.getObjectArray());
 	}
 
@@ -112,7 +112,38 @@ public class FilmGroupServiceImpl implements FilmGroupService {
 					+ "r.review_round, "
 					+ "r.opt_state "
 				+ "from "
-					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and t.film_group_id is not null and t.film_group_id != 0 " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
+					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and t.film_group_id is not null and t.film_group_id != 0 and (t.not_invite is null or t.not_invite = 0) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
+		return jdbcTemplate.limit(sql, page, wehre.getObjectArray());
+	}
+	
+	@Override
+	public List<Map<String, Object>> queryNotInviteList(Integer[] group_id, String keyword, Integer enroll_type_id,
+			Integer film_type_name, Integer film_type_name_short, Integer play_shanghai, Integer is_important,
+			Integer review_state, Integer review_round, String film_country, Page page) {
+		SqlWhere wehre = new SqlWhere()
+				.in("t.film_group_id", group_id)
+				.eq("t.film_type_name", film_type_name)
+				.eq("t.film_type_name_short", film_type_name_short)
+				.eq("t.play_shanghai", play_shanghai)
+				.eq("t.is_important", is_important)
+				.eq("t.film_country", film_country)
+				.eq("r.review_state", review_state)
+				.eq("r.review_round", review_round)
+				.lk("t.keywords", keyword);
+				;
+		
+		String table = "fc_member_film";
+		if(enroll_type_id != null) {
+			table = "(select mf.* from fc_member_film mf, fc_member_film_enroll mfe where mf.id = mfe.film_id and mfe.enroll_type_id = " + enroll_type_id + ")";
+		}
+		String sql = ""
+				+ "select "
+					+ "t.*, "
+					+ "r.review_state, "
+					+ "r.review_round, "
+					+ "r.opt_state "
+				+ "from "
+					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and t.not_invite = 1) " + StringUtil.join(" and ", " and ", "", "", wehre.getStringList());
 		return jdbcTemplate.limit(sql, page, wehre.getObjectArray());
 	}
 

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

@@ -68,6 +68,30 @@ public class FilmGroupController {
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	
+	@ResponseBody
+	@PostMapping("getNotInviteList")
+	@ApiOperation("查询移除列表(不邀请)")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", name="group_id", value="所属组ID", allowMultiple=true),
+		@ApiImplicitParam(paramType="query", name="keyword", value="搜索关键字"),
+		@ApiImplicitParam(paramType="query", name="enroll_type_id", value="影片性质1,2,3,4"),
+		@ApiImplicitParam(paramType="query", name="film_type_name", value="影片类型 1,2,3,4"),
+		@ApiImplicitParam(paramType="query", name="film_type_name_short", value="影片扩展类型 1,2,3,4,5,6,7"),
+		@ApiImplicitParam(paramType="query", name="play_shanghai", value="首映情况 1,2,3,4,5"),
+		@ApiImplicitParam(paramType="query", name="is_important", value="重点影片 0, 1"),
+		@ApiImplicitParam(paramType="query", name="review_state", value="审片结论  0未评选 1通过 2否决 3参赛 4参赛备选 5参展"),
+		@ApiImplicitParam(paramType="query", name="review_round", value="审片轮数 1,2,3,4,5,6"),
+		@ApiImplicitParam(paramType="query", name="film_country", value="国家地区"),
+	})
+	public Object getNotInviteList(Integer[] group_id, String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short, Integer play_shanghai, Integer is_important, Integer review_state, Integer review_round, String film_country, String[] orderBy, Long index, Long limit) {
+		index = index == null ? 1 : index;
+		limit = limit == null ? 20 : limit;
+		Page page = new Page(index, limit);
+		page.setLimitKey(orderBy);
+		List<Map<String, Object>> list = filmGroupService.queryNotInviteList(group_id, keyword, enroll_type_id, film_type_name, film_type_name_short, play_shanghai, is_important, review_state, review_round, film_country, page);
+		return Rjx.jsonOk().setData(list).setPage(page);
+	}
+	
 	@ResponseBody
 	@Transactional
 	@PostMapping("saveOrUpdate")

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

@@ -243,7 +243,7 @@ public class Fc_member_film implements java.io.Serializable {
 	private Integer not_invite;
 
 	@Column(columnDefinition="varchar(255) COMMENT '归档备注'")
-	private String remark;
+	private String not_invite_text;
 
 	@Column(columnDefinition="varchar(255) COMMENT '模糊查询关键字(冗余)'")
 	private String keywords;
@@ -863,12 +863,12 @@ public class Fc_member_film implements java.io.Serializable {
 		return not_invite;
 	}
 
-	public void setRemark(String remark) {
-		this.remark = remark;
+	public void setNot_invite_text(String not_invite_text) {
+		this.not_invite_text = not_invite_text;
 	}
 
-	public String getRemark() {
-		return remark;
+	public String getNot_invite_text() {
+		return not_invite_text;
 	}
 
 	public void setKeywords(String keywords) {