|
|
@@ -23,8 +23,8 @@ import org.apache.logging.log4j.util.Strings;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -48,10 +48,13 @@ 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(clueDTO.getEnd() != null, Clue::getAddTime, clueDTO.getEnd().plusDays(1L))
|
|
|
+ .lt(end != null, Clue::getAddTime, end)
|
|
|
.like(!TextUtils.isEmpty(clueDTO.getTitle()), Clue::getTitle, "%" + clueDTO.getTitle() + "%")
|
|
|
.eq(Clue::getValidity, (byte) 1)
|
|
|
.orderByDesc(Clue::getId)
|
