liuchang/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat_partyMemberEvent' into uat_code

Browse Source
This commit is contained in:
517612449@qq.com
2022-07-14 16:17:26 +08:00
parent feba281453 8743da85fb
commit a3142bfcf3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java
View File

@ -53,9 +53,9 @@ public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventSt
query.orderByDesc(EventStyle::getCreateTime); query.orderByDesc(EventStyle::getCreateTime);
List<EventStyle> list; List<EventStyle> list;
if ("banner".equals(type)) { if ("banner".equals(type)) {
query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); query.eq(EventStyle::getCategory, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort);
} else { } else {
query.eq(EventStyle::getBanner, "0").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); query.eq(EventStyle::getCategory, "2").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort);
} }
query.ne(EventStyle::getDeleteFlag, "1"); query.ne(EventStyle::getDeleteFlag, "1");
list = this.list(query); list = this.list(query);
@ -154,7 +154,7 @@ public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventSt
.sendTime(s.getSendTime()) .sendTime(s.getSendTime())
.build())); .build()));
} }
List<EventMaintainOutVO> collect = outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getSendTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList()); List<EventMaintainOutVO> collect = outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getCreateTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList());
IPage<EventMaintainOutVO> iPage = new Page<>(); IPage<EventMaintainOutVO> iPage = new Page<>();
iPage.setTotal(stylePage.getTotal()); iPage.setTotal(stylePage.getTotal());
iPage.setPages(stylePage.getPages()); iPage.setPages(stylePage.getPages());