Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
member-api
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曲欣亮
member-api
Commits
ac8b0480
Commit
ac8b0480
authored
Dec 18, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
d0d423f8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
21 deletions
+6
-21
AdminFirstController.java
...va/com/egolm/film/api/web/admin/AdminFirstController.java
+1
-1
Fc_film_group.java
src/main/java/com/egolm/film/bean/Fc_film_group.java
+4
-4
Fc_review.java
src/main/java/com/egolm/film/bean/Fc_review.java
+1
-16
No files found.
src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java
View file @
ac8b0480
...
...
@@ -58,7 +58,7 @@ public class AdminFirstController {
@ResponseBody
@PostMapping
(
"list"
)
@ApiOperation
(
"
初审通过
列表"
)
@ApiOperation
(
"
影片
列表"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
false
,
name
=
"keyword"
,
value
=
"关键字"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"int"
,
required
=
false
,
name
=
"state"
,
value
=
"影片状态 1未提交 2 已提交"
),
...
...
src/main/java/com/egolm/film/bean/
Enu
m_group.java
→
src/main/java/com/egolm/film/bean/
Fc_fil
m_group.java
View file @
ac8b0480
...
...
@@ -7,8 +7,8 @@ import javax.persistence.Id;
/**
* @author 曲欣亮
*/
@Entity
(
name
=
"
enu
m_group"
)
public
class
Enu
m_group
implements
java
.
io
.
Serializable
{
@Entity
(
name
=
"
fc_fil
m_group"
)
public
class
Fc_fil
m_group
implements
java
.
io
.
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -25,7 +25,7 @@ public class Enum_group implements java.io.Serializable {
/**
* 无参数构造方法
*/
public
Enu
m_group
()
{
public
Fc_fil
m_group
()
{
super
();
}
...
...
@@ -36,7 +36,7 @@ public class Enum_group implements java.io.Serializable {
* @param order_num
* @param group_name
*/
public
Enu
m_group
(
Integer
id
,
Integer
parent_id
,
Integer
order_num
,
String
group_name
)
{
public
Fc_fil
m_group
(
Integer
id
,
Integer
parent_id
,
Integer
order_num
,
String
group_name
)
{
this
.
id
=
id
;
this
.
parent_id
=
parent_id
;
this
.
order_num
=
order_num
;
...
...
src/main/java/com/egolm/film/bean/Fc_review.java
View file @
ac8b0480
...
...
@@ -22,11 +22,6 @@ public class Fc_review implements java.io.Serializable {
*/
private
Integer
film_id
;
/**
* 终审归档分组ID
*/
private
Integer
group_id
;
/**
* 影片性质(申报奖项)ID
*/
...
...
@@ -71,7 +66,6 @@ public class Fc_review implements java.io.Serializable {
* 全参数构造方法
* @param id
* @param film_id 参审影片ID
* @param group_id 终审归档分组ID
* @param enroll_type_id 影片性质(申报奖项)ID
* @param review_round 审片轮数,第几轮审片
* @param allot_state 评委分配状态 0未分配评委 1已分配评委评选中
...
...
@@ -80,10 +74,9 @@ public class Fc_review implements java.io.Serializable {
* @param push_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
.
film_id
=
film_id
;
this
.
group_id
=
group_id
;
this
.
enroll_type_id
=
enroll_type_id
;
this
.
review_round
=
review_round
;
this
.
allot_state
=
allot_state
;
...
...
@@ -109,14 +102,6 @@ public class Fc_review implements java.io.Serializable {
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
)
{
this
.
enroll_type_id
=
enroll_type_id
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment