孙永军 1 anno fa
parent
commit
83ac178253

+ 6 - 0
src/main/java/com/sxtvs/open/api/bid/dto/PageKeywordDTO.java

@@ -2,6 +2,8 @@ package com.sxtvs.open.api.bid.dto;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class PageKeywordDTO {
     private Integer page;
@@ -9,4 +11,8 @@ public class PageKeywordDTO {
     private Integer pageSize;
 
     private String keyword;
+
+    private LocalDateTime start;
+
+    private LocalDateTime end;
 }

+ 7 - 0
src/main/java/com/sxtvs/open/api/bid/service/impl/BidProjectServiceImpl.java

@@ -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())))