|
|
@@ -294,21 +294,21 @@ public class DailyCreativeReportService {
|
|
|
* @return 分页结果
|
|
|
*/
|
|
|
public Page<? extends BaseDailyCreativeReport> listReports(
|
|
|
- String timeLine, Long groupId, Long accountId, Long dynamicCreativeId,
|
|
|
+ String timeLine, Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId,
|
|
|
String startDate, String endDate, String sortField, String sortOrder,
|
|
|
long pageNum, long pageSize) {
|
|
|
|
|
|
if ("REPORTING_TIME".equals(timeLine)) {
|
|
|
- LambdaQueryWrapper<RepDailyCreativeReport> wrapper = buildRepWrapper(groupId, accountId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
+ LambdaQueryWrapper<RepDailyCreativeReport> wrapper = buildRepWrapper(groupId, accountId, adgroupId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
return repMapper.selectPage(new Page<>(pageNum, pageSize), wrapper);
|
|
|
} else {
|
|
|
- LambdaQueryWrapper<ReqDailyCreativeReport> wrapper = buildReqWrapper(groupId, accountId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
+ LambdaQueryWrapper<ReqDailyCreativeReport> wrapper = buildReqWrapper(groupId, accountId, adgroupId, dynamicCreativeId, startDate, endDate, sortField, sortOrder);
|
|
|
return reqMapper.selectPage(new Page<>(pageNum, pageSize), wrapper);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
private LambdaQueryWrapper<ReqDailyCreativeReport> buildReqWrapper(
|
|
|
- Long groupId, Long accountId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
+ Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
String sortField, String sortOrder) {
|
|
|
LambdaQueryWrapper<ReqDailyCreativeReport> wrapper = new LambdaQueryWrapper<>();
|
|
|
if (groupId != null) {
|
|
|
@@ -317,6 +317,9 @@ public class DailyCreativeReportService {
|
|
|
if (accountId != null) {
|
|
|
wrapper.eq(ReqDailyCreativeReport::getAccountId, accountId);
|
|
|
}
|
|
|
+ if (adgroupId != null) {
|
|
|
+ wrapper.eq(ReqDailyCreativeReport::getAdgroupId, adgroupId);
|
|
|
+ }
|
|
|
if (dynamicCreativeId != null) {
|
|
|
wrapper.eq(ReqDailyCreativeReport::getDynamicCreativeId, dynamicCreativeId);
|
|
|
}
|
|
|
@@ -332,7 +335,7 @@ public class DailyCreativeReportService {
|
|
|
}
|
|
|
|
|
|
private LambdaQueryWrapper<RepDailyCreativeReport> buildRepWrapper(
|
|
|
- Long groupId, Long accountId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
+ Long groupId, Long accountId, Long adgroupId, Long dynamicCreativeId, String startDate, String endDate,
|
|
|
String sortField, String sortOrder) {
|
|
|
LambdaQueryWrapper<RepDailyCreativeReport> wrapper = new LambdaQueryWrapper<>();
|
|
|
if (groupId != null) {
|
|
|
@@ -341,6 +344,9 @@ public class DailyCreativeReportService {
|
|
|
if (accountId != null) {
|
|
|
wrapper.eq(RepDailyCreativeReport::getAccountId, accountId);
|
|
|
}
|
|
|
+ if (adgroupId != null) {
|
|
|
+ wrapper.eq(RepDailyCreativeReport::getAdgroupId, adgroupId);
|
|
|
+ }
|
|
|
if (dynamicCreativeId != null) {
|
|
|
wrapper.eq(RepDailyCreativeReport::getDynamicCreativeId, dynamicCreativeId);
|
|
|
}
|