记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
399164f8
Commit
399164f8
authored
Apr 18, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加 创建时间倒叙
parent
ef1716f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
SmileProjectDetailsVo.java
...iquidnet/service/goblin/dto/vo/SmileProjectDetailsVo.java
+3
-0
SmileVProjectListVo.java
.../liquidnet/service/goblin/dto/vo/SmileVProjectListVo.java
+4
-1
SmileVolunteerServerImpl.java
...uidnet/service/service/impl/SmileVolunteerServerImpl.java
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileProjectDetailsVo.java
View file @
399164f8
...
...
@@ -27,6 +27,8 @@ public class SmileProjectDetailsVo implements Cloneable {
private
String
introduce
;
@ApiModelProperty
(
value
=
"封面图"
,
example
=
""
)
private
String
img
;
@ApiModelProperty
(
value
=
"封面图"
,
example
=
""
)
private
String
createdAt
;
@ApiModelProperty
(
value
=
"职责组集合"
,
example
=
""
)
private
List
<
SmileVolunteersTeam
>
teamArray
;
@ApiModelProperty
(
value
=
"职责组集合Vo"
,
example
=
""
)
...
...
@@ -51,6 +53,7 @@ public class SmileProjectDetailsVo implements Cloneable {
this
.
setAddress
(
source
.
getAddress
());
this
.
setIntroduce
(
source
.
getIntroduce
());
this
.
setImg
(
source
.
getImg
());
this
.
setCreatedAt
(
source
.
getCreatedAt
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
this
.
setTeamArray
(
teamList
);
return
this
;
}
...
...
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileVProjectListVo.java
View file @
399164f8
...
...
@@ -38,6 +38,8 @@ public class SmileVProjectListVo implements Serializable, Cloneable {
private
Integer
applyStatus
;
@ApiModelProperty
(
value
=
"活动状态[0-未开始|1-进行中|2-已结束]"
)
private
Integer
projectStatus
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
String
createdAt
;
private
static
final
SmileVProjectListVo
obj
=
new
SmileVProjectListVo
();
...
...
@@ -58,6 +60,7 @@ public class SmileVProjectListVo implements Serializable, Cloneable {
this
.
setAddress
(
source
.
getAddress
());
this
.
setImg
(
source
.
getImg
());
this
.
setApplyStatus
(
applyStatus
);
this
.
setCreatedAt
(
source
.
getCreatedAt
());
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
ldtStart
=
LocalDateTime
.
parse
(
source
.
getTimeStart
(),
DTF_YMD_HMS
);
LocalDateTime
ldtEnd
=
LocalDateTime
.
parse
(
source
.
getTimeEnd
(),
DTF_YMD_HMS
);
...
...
@@ -66,7 +69,7 @@ public class SmileVProjectListVo implements Serializable, Cloneable {
this
.
setProjectStatus
(
2
);
}
else
if
(
now
.
isBefore
(
ldtStart
))
{
this
.
setProjectStatus
(
1
);
}
else
{
}
else
{
this
.
setProjectStatus
(
1
);
}
return
this
;
...
...
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileVolunteerServerImpl.java
View file @
399164f8
...
...
@@ -72,7 +72,7 @@ public class SmileVolunteerServerImpl implements SmileVolunteersService {
// return 0;
// }
// }).thenComparing(SmileVProjectListVo::getTimeStart)).collect(Collectors.toList());
voList
=
voList
.
stream
().
sorted
(
Comparator
.
comparing
(
SmileVProjectListVo:
:
get
TimeStart
)).
collect
(
Collectors
.
toList
());
voList
=
voList
.
stream
().
sorted
(
Comparator
.
comparing
(
SmileVProjectListVo:
:
get
CreatedAt
,
Comparator
.
reverseOrder
()
)).
collect
(
Collectors
.
toList
());
return
ResponseDto
.
success
(
voList
);
}
...
...
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