Commit 37bba362 by aye

代码提交

parent 210a9bae
...@@ -79,6 +79,10 @@ class PaperDsl { ...@@ -79,6 +79,10 @@ class PaperDsl {
List<Predicate> predicate = new ArrayList<>(); List<Predicate> predicate = new ArrayList<>();
predicate.add(cb.equal(root.get("creatorId"), searchDto.getCreatorId())); predicate.add(cb.equal(root.get("creatorId"), searchDto.getCreatorId()));
if(searchDto.getSubjectId() != null){
predicate.add(cb.equal(root.get("subjectId"), searchDto.getSubjectId()));
}
if(searchDto.getUploadingStartTime() != null) { if(searchDto.getUploadingStartTime() != null) {
predicate.add(cb.greaterThanOrEqualTo(root.get("createTime"), searchDto.getUploadingStartTime())); predicate.add(cb.greaterThanOrEqualTo(root.get("createTime"), searchDto.getUploadingStartTime()));
} }
......
...@@ -13,6 +13,7 @@ import java.time.LocalDateTime; ...@@ -13,6 +13,7 @@ import java.time.LocalDateTime;
@Data @Data
public class PaperSearchForCreatorDto extends SuperDto { public class PaperSearchForCreatorDto extends SuperDto {
private Integer creatorId; private Integer creatorId;
private Integer subjectId;
private LocalDateTime uploadingStartTime; private LocalDateTime uploadingStartTime;
private LocalDateTime uploadingEndTime; private LocalDateTime uploadingEndTime;
} }
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