|
@@ -80,6 +80,13 @@ public class BidProjectServiceImpl extends ServiceImpl<BidProjectMapper, BidProj
|
|
|
if(!TextUtils.isEmpty(pageKeywordDTO.getKeyword())){
|
|
|
wrapper.like(BidProject::getProjectName, pageKeywordDTO.getKeyword());
|
|
|
}
|
|
|
+ if(Objects.nonNull(pageKeywordDTO.getStart())){
|
|
|
+ wrapper.ge(BidProject::getCreateTime, pageKeywordDTO.getStart());
|
|
|
+ }
|
|
|
+ if(Objects.nonNull(pageKeywordDTO.getEnd())){
|
|
|
+ wrapper.le(BidProject::getCreateTime, pageKeywordDTO.getEnd());
|
|
|
+ }
|
|
|
+ wrapper.orderByDesc(BidProject::getId);
|
|
|
Page<BidProject> page = this.page(objectPage, wrapper);
|
|
|
page.setRecords(page.getRecords().stream()
|
|
|
.peek(bidProject -> bidProject.setBidFiles(bidFilesService.byProject(bidProject.getId())))
|