Parcourir la source

易车报表调整

yumeng il y a 5 ans
Parent
commit
5ee7e32881

+ 5 - 6
module-report/src/main/java/cn/com/ctop/bytedance/controller/KuaiShouYiCheReportController.java

@@ -117,7 +117,7 @@ public class KuaiShouYiCheReportController {
             android.add(androidJson.getString("agent"));
             android.add(androidJson.getString("media"));
             android.add(androidJson.getString("systemType"));
-            android.add(androidJson.getString("statDate"));
+            android.add(androidJson.getString("statDate").replace("-","/"));
             android.add(androidJson.getBigDecimal("charge"));
             android.add(androidJson.getBigDecimal("cashCost"));
             android.add(androidJson.getLong("photoShow"));
@@ -151,7 +151,7 @@ public class KuaiShouYiCheReportController {
             ios.add(iosJson.getString("agent"));
             ios.add(iosJson.getString("media"));
             ios.add(iosJson.getString("systemType"));
-            ios.add(iosJson.getString("statDate"));
+            ios.add(iosJson.getString("statDate").replace("-","/"));
             ios.add(iosJson.getBigDecimal("charge"));
             ios.add(iosJson.getBigDecimal("cashCost"));
             ios.add(iosJson.getLong("photoShow"));
@@ -183,7 +183,7 @@ public class KuaiShouYiCheReportController {
             directApplication.add(directApplicationJson.getString("agent"));
             directApplication.add(directApplicationJson.getString("media"));
             directApplication.add(directApplicationJson.getString("systemType"));
-            directApplication.add(directApplicationJson.getString("statDate"));
+            directApplication.add(directApplicationJson.getString("statDate").replace("-","/"));
             directApplication.add(directApplicationJson.getBigDecimal("charge"));
             directApplication.add(directApplicationJson.getBigDecimal("cashCost"));
             directApplication.add(directApplicationJson.getLong("photoShow"));
@@ -215,9 +215,8 @@ public class KuaiShouYiCheReportController {
                 JSONObject channelSubcontractingJson = channelSubcontractingArr.getJSONObject(i);
                 List<Object> channelSubcontracting = new ArrayList();
                 channelSubcontracting.add(channelSubcontractingJson.getString("agent"));
-                channelSubcontracting.add(channelSubcontractingJson.getString("media"));
                 channelSubcontracting.add(channelSubcontractingJson.getString("systemType"));
-                channelSubcontracting.add(channelSubcontractingJson.getString("statDate"));
+                channelSubcontracting.add(channelSubcontractingJson.getString("statDate").replace("-","/"));
                 channelSubcontracting.add(channelSubcontractingJson.getString("campaignName"));
                 channelSubcontracting.add(channelSubcontractingJson.getBigDecimal("charge"));
                 channelSubcontracting.add(channelSubcontractingJson.getBigDecimal("cashCost"));
@@ -246,7 +245,7 @@ public class KuaiShouYiCheReportController {
         String[] iosHeaders = {"代理商", "媒体", "设备", "日期", "账面花费", "现金花费", "曝光", "点击", "点击率", "千次曝光花费", "行为量", "下载完成数", "账户激活量", "友盟激活量", "TD激活量", "账户激活成本", "友盟激活成本", "TD激活成本", "平均行为单价", "平均点击单价", "行为率", "下载完成行为率", "下载完成激活率"};
         String[] androidHeaders = {"代理商", "媒体", "设备", "日期", "账面花费", "现金花费", "曝光", "点击", "点击率", "千次曝光花费", "行为量", "下载完成数", "账户激活量", "友盟激活量", "TD激活量", "账户激活成本", "友盟激活成本", "TD激活成本", "平均行为单价", "平均点击单价", "行为率", "下载完成行为率", "下载完成激活率"};
         String[] directApplicationHeaders = {"代理商", "媒体", "设备", "日期", "账面花费", "现金花费", "曝光", "点击", "点击率", "千次曝光花费", "行为量", "下载完成数", "账户激活量", "友盟激活量", "TD激活量", "账户激活成本", "友盟激活成本", "TD激活成本", "平均行为单价", "平均点击单价", "行为率", "下载完成行为率", "下载完成激活率"};
-        String[] channelSubcontractingHeaders = {"代理商", "媒体", "设备", "日期", "渠道包", "账面花费", "现金花费", "曝光", "点击", "点击率", "千次曝光花费", "行为量", "下载完成数", "账户激活量", "友盟激活量", "TD激活量", "账户激活成本", "友盟激活成本", "TD激活成本", "平均行为单价", "平均点击单价", "行为率", "下载完成行为率", "下载完成激活率"};
+        String[] channelSubcontractingHeaders = {"代理商", "设备", "日期", "渠道包", "账面花费", "现金花费", "曝光", "点击", "点击率", "千次曝光花费", "行为量", "下载完成数", "账户激活量", "友盟激活量", "TD激活量", "账户激活成本", "友盟激活成本", "TD激活成本", "平均行为单价", "平均点击单价", "行为率", "下载完成行为率", "下载完成激活率"};
 
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/KuaiShouYiCheReportServiceImpl.java

@@ -24,7 +24,7 @@ public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportServi
         log.info("易车时报数据统计开始:requestJson:{}", requestJson);
         Long projectId = requestJson.getLong("projectId");
         BigDecimal disCount = requestJson.getBigDecimal("disCount");
-        String statDate = DateUtils.getNowDate("yyyy-MM-dd");
+        String statDate = requestJson.getString("statDate");
 
         JSONObject returnJson = new JSONObject();
         Integer maxHour = kuaiShouYiCheReportMapper.getMaxHourByProjectIdAndStatDate(statDate, projectId);