记得上下班打卡 | git大法好,push需谨慎

Commit 399164f8 authored by 胡佳晨's avatar 胡佳晨

增加 创建时间倒叙

parent ef1716f3
......@@ -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;
}
......
......@@ -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;
......
......@@ -72,7 +72,7 @@ public class SmileVolunteerServerImpl implements SmileVolunteersService {
// return 0;
// }
// }).thenComparing(SmileVProjectListVo::getTimeStart)).collect(Collectors.toList());
voList = voList.stream().sorted(Comparator.comparing(SmileVProjectListVo::getTimeStart)).collect(Collectors.toList());
voList = voList.stream().sorted(Comparator.comparing(SmileVProjectListVo::getCreatedAt, Comparator.reverseOrder())).collect(Collectors.toList());
return ResponseDto.success(voList);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment