|
@@ -282,23 +282,26 @@ public class DailyCreativeReportService {
|
|
|
* @return 分页结果
|
|
* @return 分页结果
|
|
|
*/
|
|
*/
|
|
|
public Page<? extends BaseDailyCreativeReport> listReports(
|
|
public Page<? extends BaseDailyCreativeReport> listReports(
|
|
|
- String timeLine, Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId,
|
|
|
|
|
|
|
+ String timeLine, Long confId, Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId,
|
|
|
String startDate, String endDate, String sortField, String sortOrder,
|
|
String startDate, String endDate, String sortField, String sortOrder,
|
|
|
long pageNum, long pageSize) {
|
|
long pageNum, long pageSize) {
|
|
|
|
|
|
|
|
if ("REPORTING_TIME".equals(timeLine)) {
|
|
if ("REPORTING_TIME".equals(timeLine)) {
|
|
|
- LambdaQueryWrapper<RepDailyCreativeReport> wrapper = buildRepWrapper(groupId, accountId, adgroupId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
|
|
|
|
+ LambdaQueryWrapper<RepDailyCreativeReport> wrapper = buildRepWrapper(confId, groupId, accountId, adgroupId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
return repMapper.selectPage(new Page<>(pageNum, pageSize), wrapper);
|
|
return repMapper.selectPage(new Page<>(pageNum, pageSize), wrapper);
|
|
|
} else {
|
|
} else {
|
|
|
- LambdaQueryWrapper<ReqDailyCreativeReport> wrapper = buildReqWrapper(groupId, accountId, adgroupId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
|
|
|
|
+ LambdaQueryWrapper<ReqDailyCreativeReport> wrapper = buildReqWrapper(confId, groupId, accountId, adgroupId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
return reqMapper.selectPage(new Page<>(pageNum, pageSize), wrapper);
|
|
return reqMapper.selectPage(new Page<>(pageNum, pageSize), wrapper);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private LambdaQueryWrapper<ReqDailyCreativeReport> buildReqWrapper(
|
|
private LambdaQueryWrapper<ReqDailyCreativeReport> buildReqWrapper(
|
|
|
- Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
|
|
|
|
+ Long confId, Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
String sortField, String sortOrder) {
|
|
String sortField, String sortOrder) {
|
|
|
LambdaQueryWrapper<ReqDailyCreativeReport> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<ReqDailyCreativeReport> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ if (confId != null) {
|
|
|
|
|
+ wrapper.eq(ReqDailyCreativeReport::getConfId, confId);
|
|
|
|
|
+ }
|
|
|
if (groupId != null) {
|
|
if (groupId != null) {
|
|
|
wrapper.eq(ReqDailyCreativeReport::getGroupId, groupId);
|
|
wrapper.eq(ReqDailyCreativeReport::getGroupId, groupId);
|
|
|
}
|
|
}
|
|
@@ -323,9 +326,12 @@ public class DailyCreativeReportService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private LambdaQueryWrapper<RepDailyCreativeReport> buildRepWrapper(
|
|
private LambdaQueryWrapper<RepDailyCreativeReport> buildRepWrapper(
|
|
|
- Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
|
|
|
|
+ Long confId, Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
String sortField, String sortOrder) {
|
|
String sortField, String sortOrder) {
|
|
|
LambdaQueryWrapper<RepDailyCreativeReport> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<RepDailyCreativeReport> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ if (confId != null) {
|
|
|
|
|
+ wrapper.eq(RepDailyCreativeReport::getConfId, confId);
|
|
|
|
|
+ }
|
|
|
if (groupId != null) {
|
|
if (groupId != null) {
|
|
|
wrapper.eq(RepDailyCreativeReport::getGroupId, groupId);
|
|
wrapper.eq(RepDailyCreativeReport::getGroupId, groupId);
|
|
|
}
|
|
}
|