|
@@ -416,12 +416,20 @@ public class AdvertiserController {
|
|
|
if (null == systemType || systemType.trim().equals("")) {
|
|
|
systemType = null;
|
|
|
}
|
|
|
- SheetInfoVo totalSheetVo = advertiserService.getXxlStatisticInfo(projectId, systemType, null, null, "汇总表");
|
|
|
+ SheetInfoVo totalSheetVo = advertiserService.getXxlStatisticInfo(projectId, systemType, null, "汇总表");
|
|
|
sheets.add(totalSheetVo);
|
|
|
+ if(null == systemType){
|
|
|
+ List<SheetInfoVo>vos = advertiserService.getSystemTypeXxlStatisticInfo(projectId);
|
|
|
+ if(null!=vos&&vos.size()>0){
|
|
|
+ for(SheetInfoVo vo:vos){
|
|
|
+ sheets.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
List<UserAllocation> allocations = userAllocationService.getByProjectId(projectId, systemType);
|
|
|
if (null != allocations && allocations.size() > 0) {
|
|
|
for (UserAllocation allocation : allocations) {
|
|
|
- SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), "state_date", allocation.getAuthName());
|
|
|
+ SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), allocation.getAuthName());
|
|
|
sheets.add(vo);
|
|
|
}
|
|
|
}
|
|
@@ -443,12 +451,20 @@ public class AdvertiserController {
|
|
|
systemType = null;
|
|
|
}
|
|
|
//查询总的消耗信息
|
|
|
- SheetInfoVo totalSheetVo = advertiserService.getXxlStatisticInfo(projectId, systemType, null, null, "汇总表");
|
|
|
+ SheetInfoVo totalSheetVo = advertiserService.getXxlStatisticInfo(projectId, systemType, null, "汇总表");
|
|
|
sheets.add(totalSheetVo);
|
|
|
+ if(null == systemType){
|
|
|
+ List<SheetInfoVo>vos = advertiserService.getSystemTypeXxlStatisticInfo(projectId);
|
|
|
+ if(null!=vos&&vos.size()>0){
|
|
|
+ for(SheetInfoVo vo:vos){
|
|
|
+ sheets.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
List<UserAllocation> allocations = userAllocationService.getByProjectId(projectId, systemType);
|
|
|
if (null != allocations && allocations.size() > 0) {
|
|
|
for (UserAllocation allocation : allocations) {
|
|
|
- SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), "state_date", allocation.getAuthName());
|
|
|
+ SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), allocation.getAuthName());
|
|
|
sheets.add(vo);
|
|
|
}
|
|
|
}
|