Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-evaluate
Overview
Overview
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
base_platform_enterprise
gic-evaluate
Commits
c2fa4f18
Commit
c2fa4f18
authored
Apr 10, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
66a827c1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletions
+21
-1
EvaluateQO.java
...ate-api/src/main/java/com/gic/evaluate/qo/EvaluateQO.java
+13
-0
EvaluateOutApiServiceImpl.java
...valuate/service/outer/impl/EvaluateOutApiServiceImpl.java
+2
-0
TabEvaluateMapper.xml
...e-service/src/main/resources/mapper/TabEvaluateMapper.xml
+6
-1
No files found.
gic-evaluate-api/src/main/java/com/gic/evaluate/qo/EvaluateQO.java
View file @
c2fa4f18
...
...
@@ -92,6 +92,11 @@ public class EvaluateQO extends PageQO{
private
Integer
[]
evaluateIds
;
private
Long
memberId
;
/**
* 标志请求来自小程序
*/
private
Integer
applet
;
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
...
...
@@ -299,4 +304,12 @@ public class EvaluateQO extends PageQO{
public
Long
getMemberId
()
{
return
memberId
;
}
public
Integer
getApplet
()
{
return
applet
;
}
public
void
setApplet
(
Integer
applet
)
{
this
.
applet
=
applet
;
}
}
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java
View file @
c2fa4f18
...
...
@@ -266,6 +266,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
evaluateQO
.
setMaliciousStatus
(
Constants
.
CLOSE
);
evaluateQO
.
setCurrentPage
(
currentPage
);
evaluateQO
.
setPageSize
(
pageSize
);
evaluateQO
.
setApplet
(
1
);
TabEvaluateOrderConfig
evaluateOrderConfig
=
this
.
evaluateOrderConfigService
.
getEvaluateOrderConfig
(
enterpriseId
);
Integer
orderType
=
evaluateOrderConfig
.
getOrderType
();
...
...
@@ -318,6 +319,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
evaluateQO
.
setMaliciousStatus
(
Constants
.
CLOSE
);
evaluateQO
.
setCurrentPage
(
1
);
evaluateQO
.
setPageSize
(
1
);
evaluateQO
.
setApplet
(
1
);
// 查询置顶的
com
.
github
.
pagehelper
.
Page
<
TabEvaluate
>
topHotEvaluate
=
evaluateService
.
listEvaluateNearByStore
(
evaluateQO
);
if
(
CollectionUtils
.
isEmpty
(
topHotEvaluate
))
{
...
...
gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml
View file @
c2fa4f18
...
...
@@ -599,7 +599,12 @@
</if>
</if>
<if
test=
"orderByField == null "
>
order by top_hot_status DESC, evaluate_time desc
<if
test=
"applet != null"
>
order by top_hot_status DESC, evaluate_time desc
</if>
<if
test=
"applet == null"
>
order by evaluate_time desc
</if>
</if>
</select>
<select
id=
"countEvaluate"
resultType=
"int"
>
...
...
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