Commit ac8b0480 authored by Quxl's avatar Quxl

x

parent d0d423f8
...@@ -58,7 +58,7 @@ public class AdminFirstController { ...@@ -58,7 +58,7 @@ public class AdminFirstController {
@ResponseBody @ResponseBody
@PostMapping("list") @PostMapping("list")
@ApiOperation("初审通过列表") @ApiOperation("影片列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(paramType="query", dataType="string", required=false, name="keyword", value="关键字"), @ApiImplicitParam(paramType="query", dataType="string", required=false, name="keyword", value="关键字"),
@ApiImplicitParam(paramType="query", dataType="int", required=false, name="state", value="影片状态 1未提交 2 已提交"), @ApiImplicitParam(paramType="query", dataType="int", required=false, name="state", value="影片状态 1未提交 2 已提交"),
......
...@@ -7,8 +7,8 @@ import javax.persistence.Id; ...@@ -7,8 +7,8 @@ import javax.persistence.Id;
/** /**
* @author 曲欣亮 * @author 曲欣亮
*/ */
@Entity(name="enum_group") @Entity(name="fc_film_group")
public class Enum_group implements java.io.Serializable { public class Fc_film_group implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -25,7 +25,7 @@ public class Enum_group implements java.io.Serializable { ...@@ -25,7 +25,7 @@ public class Enum_group implements java.io.Serializable {
/** /**
* 无参数构造方法 * 无参数构造方法
*/ */
public Enum_group () { public Fc_film_group () {
super(); super();
} }
...@@ -36,7 +36,7 @@ public class Enum_group implements java.io.Serializable { ...@@ -36,7 +36,7 @@ public class Enum_group implements java.io.Serializable {
* @param order_num * @param order_num
* @param group_name * @param group_name
*/ */
public Enum_group(Integer id, Integer parent_id, Integer order_num, String group_name) { public Fc_film_group(Integer id, Integer parent_id, Integer order_num, String group_name) {
this.id = id; this.id = id;
this.parent_id = parent_id; this.parent_id = parent_id;
this.order_num = order_num; this.order_num = order_num;
......
...@@ -22,11 +22,6 @@ public class Fc_review implements java.io.Serializable { ...@@ -22,11 +22,6 @@ public class Fc_review implements java.io.Serializable {
*/ */
private Integer film_id; private Integer film_id;
/**
* 终审归档分组ID
*/
private Integer group_id;
/** /**
* 影片性质(申报奖项)ID * 影片性质(申报奖项)ID
*/ */
...@@ -71,7 +66,6 @@ public class Fc_review implements java.io.Serializable { ...@@ -71,7 +66,6 @@ public class Fc_review implements java.io.Serializable {
* 全参数构造方法 * 全参数构造方法
* @param id * @param id
* @param film_id 参审影片ID * @param film_id 参审影片ID
* @param group_id 终审归档分组ID
* @param enroll_type_id 影片性质(申报奖项)ID * @param enroll_type_id 影片性质(申报奖项)ID
* @param review_round 审片轮数,第几轮审片 * @param review_round 审片轮数,第几轮审片
* @param allot_state 评委分配状态 0未分配评委 1已分配评委评选中 * @param allot_state 评委分配状态 0未分配评委 1已分配评委评选中
...@@ -80,10 +74,9 @@ public class Fc_review implements java.io.Serializable { ...@@ -80,10 +74,9 @@ public class Fc_review implements java.io.Serializable {
* @param push_time 推送时间 * @param push_time 推送时间
* @param create_time * @param create_time
*/ */
public Fc_review(Integer id, Integer film_id, Integer group_id, Integer enroll_type_id, Integer review_round, Integer allot_state, Integer review_state, Integer opt_state, Date push_time, Date create_time) { public Fc_review(Integer id, Integer film_id, Integer enroll_type_id, Integer review_round, Integer allot_state, Integer review_state, Integer opt_state, Date push_time, Date create_time) {
this.id = id; this.id = id;
this.film_id = film_id; this.film_id = film_id;
this.group_id = group_id;
this.enroll_type_id = enroll_type_id; this.enroll_type_id = enroll_type_id;
this.review_round = review_round; this.review_round = review_round;
this.allot_state = allot_state; this.allot_state = allot_state;
...@@ -109,14 +102,6 @@ public class Fc_review implements java.io.Serializable { ...@@ -109,14 +102,6 @@ public class Fc_review implements java.io.Serializable {
return film_id; return film_id;
} }
public void setGroup_id(Integer group_id) {
this.group_id = group_id;
}
public Integer getGroup_id() {
return group_id;
}
public void setEnroll_type_id(Integer enroll_type_id) { public void setEnroll_type_id(Integer enroll_type_id) {
this.enroll_type_id = enroll_type_id; this.enroll_type_id = enroll_type_id;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment