孙永军 2 lat temu
rodzic
commit
7a0b37916d

+ 3 - 2
src/main/java/com/sxtvs/open/api/clue/dto/ClueDTO.java

@@ -3,12 +3,13 @@ package com.sxtvs.open.api.clue.dto;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 public class ClueDTO {
-    private LocalDate start;
+    private LocalDateTime start;
 
-    private LocalDate end;
+    private LocalDateTime end;
 
     private String Title;
 

+ 2 - 5
src/main/java/com/sxtvs/open/api/clue/service/impl/ClueServiceImpl.java

@@ -48,13 +48,10 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements IC
     public IPage<Clue> cluePage(ClueDTO clueDTO){
 
         LambdaQueryWrapper<Clue> wrapper = Wrappers.lambdaQuery();
-        LocalDate end = clueDTO.getEnd();
-        if(end != null){
-            end = clueDTO.getEnd().plusDays(1L);
-        }
+
         IPage<Clue> clueIPage = baseMapper.selectPage(new Page<>(clueDTO.getPage(), clueDTO.getSize()),
                 wrapper.ge(clueDTO.getStart() != null, Clue::getAddTime, clueDTO.getStart())
-                .lt(end != null, Clue::getAddTime, end)
+                .lt(clueDTO.getEnd() != null, Clue::getAddTime, clueDTO.getEnd())
                 .like(!TextUtils.isEmpty(clueDTO.getTitle()), Clue::getTitle, "%" + clueDTO.getTitle() + "%")
                 .eq(Clue::getValidity, (byte) 1)
                 .orderByDesc(Clue::getId)