|
@@ -37,12 +37,14 @@ public class SysTelemarketingWechatDataServiceImpl extends ServiceImpl<SysTelema
|
|
|
sysTelemarketingWechatDataPage = lambdaQuery()
|
|
sysTelemarketingWechatDataPage = lambdaQuery()
|
|
|
.between(StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()) && StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()),
|
|
.between(StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()) && StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()),
|
|
|
SysTelemarketingWechatData::getCreateTime,sysTelemarketingWechatDataVo.getStartTime(),sysTelemarketingWechatDataVo.getEndTime())
|
|
SysTelemarketingWechatData::getCreateTime,sysTelemarketingWechatDataVo.getStartTime(),sysTelemarketingWechatDataVo.getEndTime())
|
|
|
|
|
+ .orderByDesc(SysTelemarketingWechatData::getId)
|
|
|
.page(page);
|
|
.page(page);
|
|
|
}else {
|
|
}else {
|
|
|
sysTelemarketingWechatDataPage = lambdaQuery()
|
|
sysTelemarketingWechatDataPage = lambdaQuery()
|
|
|
.eq(SysTelemarketingWechatData::getUserId, userId)
|
|
.eq(SysTelemarketingWechatData::getUserId, userId)
|
|
|
.between(StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()) && StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()),
|
|
.between(StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()) && StringUtils.isNotEmpty(sysTelemarketingWechatDataVo.getStartTime()),
|
|
|
SysTelemarketingWechatData::getCreateTime,sysTelemarketingWechatDataVo.getStartTime(),sysTelemarketingWechatDataVo.getEndTime())
|
|
SysTelemarketingWechatData::getCreateTime,sysTelemarketingWechatDataVo.getStartTime(),sysTelemarketingWechatDataVo.getEndTime())
|
|
|
|
|
+ .orderByDesc(SysTelemarketingWechatData::getId)
|
|
|
.page(page);
|
|
.page(page);
|
|
|
}
|
|
}
|
|
|
return new BasePageResult<>(
|
|
return new BasePageResult<>(
|