Explorar o código

Merge branch 'master' into test

yumeng %!s(int64=4) %!d(string=hai) anos
pai
achega
e6d065dad6

+ 2 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaiShouDailyAgentController.java

@@ -262,6 +262,7 @@ public class KuaiShouDailyAgentController {
                 kuaishouReportDailyAgentSum.add(agent.getDate());  //日期
                 kuaishouReportDailyAgentSum.add(agent.getKid());  //快手id
                 kuaishouReportDailyAgentSum.add(agent.getAdvertiserName());  //广告主名称
+                kuaishouReportDailyAgentSum.add(agent.getAccountId());  //账户id
                 kuaishouReportDailyAgentSum.add(agent.getAccountName());  //账户名称
                 // kuaishouReportDailyAgentSum.add(DateUtils.formatDate(agent.getAdvertiserCreateTime()));  //广告主创建时间
                 kuaishouReportDailyAgentSum.add(agent.getCostCampaignCount());  //有消费计划数量
@@ -286,7 +287,7 @@ public class KuaiShouDailyAgentController {
             }
         }
 
-        String[] groupHeaders = {"日期", "快手id", "广告主名称", "账户名称", "有消费计划数量", "总余额", "总消耗", "消耗环比", "现金消耗", "返点消耗", "框返消耗", "激励消耗", "信用消耗", "封面曝光数", "封面点击数", "素材曝光数", "行为数", "封面点击率", "转化点击率", "一级行业", "二级行业"};
+        String[] groupHeaders = {"日期", "快手id", "广告主名称", "广告主id", "账户名称", "有消费计划数量", "总余额", "总消耗", "消耗环比", "现金消耗", "返点消耗", "框返消耗", "激励消耗", "信用消耗", "封面曝光数", "封面点击数", "素材曝光数", "行为数", "封面点击率", "转化点击率", "一级行业", "二级行业"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();