|
@@ -384,6 +384,14 @@ public class AdvertiserController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ List<UserAllocation> allocations = userAllocationService.getByProjectId(projectId, systemType);
|
|
|
|
+ if (null != allocations && !allocations.isEmpty()) {
|
|
|
|
+ for (UserAllocation allocation : allocations) {
|
|
|
|
+ SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), allocation.getAuthName());
|
|
|
|
+ sheets.add(vo);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
result.put("data", sheets);
|
|
result.put("data", sheets);
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
return result;
|
|
return result;
|
|
@@ -413,6 +421,14 @@ public class AdvertiserController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ List<UserAllocation> allocations = userAllocationService.getByProjectId(projectId, systemType);
|
|
|
|
+ if (null != allocations && !allocations.isEmpty()) {
|
|
|
|
+ for (UserAllocation allocation : allocations) {
|
|
|
|
+ SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), allocation.getAuthName());
|
|
|
|
+ sheets.add(vo);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
OutputStream outputStream = response.getOutputStream();
|
|
OutputStream outputStream = response.getOutputStream();
|
|
String date = DateUtils.formatDate(new Date());
|
|
String date = DateUtils.formatDate(new Date());
|
|
HttpUtils.setResponseHeader(response, "爱上消消消日报" + date + ".xls");
|
|
HttpUtils.setResponseHeader(response, "爱上消消消日报" + date + ".xls");
|