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