Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
sentinel
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
曲欣亮
sentinel
Commits
c2d45de6
Commit
c2d45de6
authored
Jan 25, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
01b5bb24
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
ReviewServiceImpl.java
...va/com/egolm/film/api/service/impl/ReviewServiceImpl.java
+2
-3
No files found.
src/main/java/com/egolm/film/api/service/impl/ReviewServiceImpl.java
View file @
c2d45de6
...
...
@@ -752,7 +752,6 @@ public class ReviewServiceImpl implements ReviewService {
+
"from "
+
"fc_review r "
+
"left join fc_member_film mf on mf.id = r.film_id "
+
"left join fc_member_film_enroll mfe on mfe.film_id = r.film_id and mfe.enroll_type_id = 4 "
+
"left join fc_review_history rh on rh.enroll_type_id != 4 and rh.review_state = 3 and rh.review_id = r.id"
+
(
enroll_type_id
==
null
?
""
:
(
", fc_member_film_enroll mfe where mfe.film_id = r.film_id and mfe.enroll_type_id = "
+
enroll_type_id
))
;
...
...
@@ -764,9 +763,9 @@ public class ReviewServiceImpl implements ReviewService {
;
if
(
from_round
!=
null
)
{
if
(
from_round
==
0
)
{
where
.
eq
(
"t.enroll_type_name"
,
4
);
where
.
eq
(
"t.enroll_type_name"
,
"4"
);
}
else
{
where
.
ne
(
"t.t.enroll_type_name"
,
4
).
eq
(
"t.state_3_round"
,
from_round
);
where
.
ne
(
"t.t.enroll_type_name"
,
"4"
).
eq
(
"t.state_3_round"
,
from_round
);
}
}
sql
=
"select t.* from ("
+
sql
+
") t "
+
StringUtil
.
join
(
" and "
,
" where "
,
""
,
where
.
getStringList
())
+
" order by t.film_id desc"
;
...
...
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