Browse Source

易车极速版报表导出失败

yumeng 5 years ago
parent
commit
4b2934ff70

+ 12 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaiShouYiCheReportController.java

@@ -117,7 +117,9 @@ public class KuaiShouYiCheReportController {
             android.add(androidJson.getString("agent"));
             android.add(androidJson.getString("agent"));
             android.add(androidJson.getString("media"));
             android.add(androidJson.getString("media"));
             android.add(androidJson.getString("systemType"));
             android.add(androidJson.getString("systemType"));
-            android.add(androidJson.getString("statDate").replace("-","/"));
+            if (!Check.isNull(androidJson.getString("statDate"))) {
+                android.add(androidJson.getString("statDate").replace("-", "/"));
+            }
             android.add(androidJson.getBigDecimal("charge"));
             android.add(androidJson.getBigDecimal("charge"));
             android.add(androidJson.getBigDecimal("cashCost"));
             android.add(androidJson.getBigDecimal("cashCost"));
             android.add(androidJson.getLong("photoShow"));
             android.add(androidJson.getLong("photoShow"));
@@ -151,7 +153,9 @@ public class KuaiShouYiCheReportController {
             ios.add(iosJson.getString("agent"));
             ios.add(iosJson.getString("agent"));
             ios.add(iosJson.getString("media"));
             ios.add(iosJson.getString("media"));
             ios.add(iosJson.getString("systemType"));
             ios.add(iosJson.getString("systemType"));
-            ios.add(iosJson.getString("statDate").replace("-","/"));
+            if (!Check.isNull(iosJson.getString("statDate"))) {
+                ios.add(iosJson.getString("statDate").replace("-", "/"));
+            }
             ios.add(iosJson.getBigDecimal("charge"));
             ios.add(iosJson.getBigDecimal("charge"));
             ios.add(iosJson.getBigDecimal("cashCost"));
             ios.add(iosJson.getBigDecimal("cashCost"));
             ios.add(iosJson.getLong("photoShow"));
             ios.add(iosJson.getLong("photoShow"));
@@ -183,7 +187,9 @@ public class KuaiShouYiCheReportController {
             directApplication.add(directApplicationJson.getString("agent"));
             directApplication.add(directApplicationJson.getString("agent"));
             directApplication.add(directApplicationJson.getString("media"));
             directApplication.add(directApplicationJson.getString("media"));
             directApplication.add(directApplicationJson.getString("systemType"));
             directApplication.add(directApplicationJson.getString("systemType"));
-            directApplication.add(directApplicationJson.getString("statDate").replace("-","/"));
+            if (!Check.isNull(directApplicationJson.getString("statDate"))) {
+                directApplication.add(directApplicationJson.getString("statDate").replace("-", "/"));
+            }
             directApplication.add(directApplicationJson.getBigDecimal("charge"));
             directApplication.add(directApplicationJson.getBigDecimal("charge"));
             directApplication.add(directApplicationJson.getBigDecimal("cashCost"));
             directApplication.add(directApplicationJson.getBigDecimal("cashCost"));
             directApplication.add(directApplicationJson.getLong("photoShow"));
             directApplication.add(directApplicationJson.getLong("photoShow"));
@@ -216,7 +222,9 @@ public class KuaiShouYiCheReportController {
                 List<Object> channelSubcontracting = new ArrayList();
                 List<Object> channelSubcontracting = new ArrayList();
                 channelSubcontracting.add(channelSubcontractingJson.getString("agent"));
                 channelSubcontracting.add(channelSubcontractingJson.getString("agent"));
                 channelSubcontracting.add(channelSubcontractingJson.getString("systemType"));
                 channelSubcontracting.add(channelSubcontractingJson.getString("systemType"));
-                channelSubcontracting.add(channelSubcontractingJson.getString("statDate").replace("-","/"));
+                if (!Check.isNull(channelSubcontractingJson.getString("statDate"))) {
+                    channelSubcontracting.add(channelSubcontractingJson.getString("statDate").replace("-", "/"));
+                }
                 channelSubcontracting.add(channelSubcontractingJson.getString("campaignName"));
                 channelSubcontracting.add(channelSubcontractingJson.getString("campaignName"));
                 channelSubcontracting.add(channelSubcontractingJson.getBigDecimal("charge"));
                 channelSubcontracting.add(channelSubcontractingJson.getBigDecimal("charge"));
                 channelSubcontracting.add(channelSubcontractingJson.getBigDecimal("cashCost"));
                 channelSubcontracting.add(channelSubcontractingJson.getBigDecimal("cashCost"));