Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
4c1dd71d
Commit
4c1dd71d
authored
Mar 12, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
72a2338e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletions
+10
-1
StoreController.java
...com/gic/haoban/manage/web/controller/StoreController.java
+2
-1
StoreVO.java
...x/src/main/java/com/gic/haoban/manage/web/vo/StoreVO.java
+8
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
View file @
4c1dd71d
...
...
@@ -81,6 +81,7 @@ public class StoreController extends WebBaseController{
VO
.
setEnterpriseId
(
storeDTO
.
getEnterpriseId
());
}
}
VO
.
setCreateTime
(
dto
.
getCreateTime
());
resultList
.
add
(
VO
);
}
...
...
@@ -131,7 +132,7 @@ public class StoreController extends WebBaseController{
}
}
if
(
CollectionUtils
.
isNotEmpty
(
resultList
)){
resultList
=
resultList
.
stream
().
sorted
(
Comparator
.
comparing
(
StoreVO:
:
getBindFlag
).
thenComparing
(
StoreVO:
:
getClerkType
).
reversed
(
)).
collect
(
Collectors
.
toList
());
resultList
=
resultList
.
stream
().
sorted
(
Comparator
.
comparing
(
StoreVO:
:
getBindFlag
).
reversed
().
thenComparing
(
StoreVO:
:
getCreateTime
)).
collect
(
Collectors
.
toList
());
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
resultList
);
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreVO.java
View file @
4c1dd71d
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* Created 2018/10/22.
...
...
@@ -22,7 +23,14 @@ public class StoreVO implements Serializable {
private
String
storeImg
;
private
int
clerkType
;
private
String
wxEnterpriseRelatedId
;
private
Date
createTime
;
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
String
getClerkId
()
{
return
clerkId
;
}
...
...
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