|
|
@ -101,10 +101,10 @@ public class StatisticsServiceImpl extends ServiceImpl<StatisticsMapper, Statist |
|
|
|
public IPage<Statistics> selectPage(Page<Statistics> page1, StatisticsVo statistics) { |
|
|
|
public IPage<Statistics> selectPage(Page<Statistics> page1, StatisticsVo statistics) { |
|
|
|
QueryWrapper<Statistics> queryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<Statistics> queryWrapper = new QueryWrapper<>(); |
|
|
|
//开始时间
|
|
|
|
//开始时间
|
|
|
|
queryWrapper.lambda().eq(StringUtils.isNotEmpty(statistics.getCreateTime()),Statistics::getDateCalculated, |
|
|
|
queryWrapper.lambda().ge(StringUtils.isNotEmpty(statistics.getCreateTime()),Statistics::getDateCalculated, |
|
|
|
statistics.getCreateTime()); |
|
|
|
statistics.getCreateTime()); |
|
|
|
//结束时间
|
|
|
|
//结束时间
|
|
|
|
queryWrapper.lambda().eq(StringUtils.isNotEmpty(statistics.getEndTime()),Statistics::getDateCalculated, |
|
|
|
queryWrapper.lambda().le(StringUtils.isNotEmpty(statistics.getEndTime()),Statistics::getDateCalculated, |
|
|
|
statistics.getEndTime()); |
|
|
|
statistics.getEndTime()); |
|
|
|
IPage<Statistics> statisticsPage = baseMapper.selectPage(page1, queryWrapper); |
|
|
|
IPage<Statistics> statisticsPage = baseMapper.selectPage(page1, queryWrapper); |
|
|
|
return statisticsPage; |
|
|
|
return statisticsPage; |
|
|
|