Browse Source

Merge branch 'V2.0.1' into test

zhaoxian 3 năm trước cách đây
mục cha
commit
9c3a3b1d1c

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java

@@ -216,6 +216,7 @@ public class KsVideoReportCtrl {
             if (Check.isNull(filedAll)) {
                 throw new Exception("初始化查询 字段返回为空");
             }
+            filedAll = filedAll.replace("photo_show","`show`");
             requestMap.put("filed", filedAll);
             requestMap.put("startDate", startDate);
             requestMap.put("endDate", endDate);

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouAccountReportServiceImpl.java

@@ -127,6 +127,7 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
 
     @Override
     public List<JSONObject> getExcelDataBy(String filed, String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
+        filed = filed.replace("photo_show", "`show`");
         List<JSONObject> result;
         if (startDate.equals(endDate)) {
             if (startDate.equals(DateUtils.date2Str())) {

+ 8 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceVideoReportCtrl.java

@@ -139,6 +139,14 @@ public class BytedanceVideoReportCtrl {
             columns.add("cost");
         }
         String filed = JsonResourceUtil.joinFiled(AccountReportConstants.getDicMapByVideo(), columns);
+        filed = filed.replace("like_material", "`like`").
+                replace("material_show", "`show`").
+                replace("convert_material", "`convert`").
+                replace("play50_feed_break", "play_50_feed_break").
+                replace("play100_feed_break", "play_100_feed_break").
+                replace("play25_feed_break", "play_25_feed_break").
+                replace("play75_feed_break", "play_75_feed_break").
+                replace("share_material", "share");
         List<String> titles = new ArrayList<>(JsonResourceUtil.joinTitle(AccountReportConstants.getDicMapByVideo(), columns));
         //此处增加两个元素是为了保证数据顺序
         if ("exportDetail".equals(exportType)) {

+ 7 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceAccountReportServiceImpl.java

@@ -154,6 +154,13 @@ public class BytedanceAccountReportServiceImpl implements IBytedanceAccountRepor
 
     @Override
     public List<JSONObject> getExcelDataBy(String filed, String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
+        filed = filed.replace("like_num", "`like`").
+                replace("show_num", "`show`").
+                replace("convert_num", "`convert`").
+                replace("play50_feed_break", "play_50_feed_break").
+                replace("play100_feed_break", "play_100_feed_break").
+                replace("play25_feed_break", "play_25_feed_break").
+                replace("play75_feed_break", "play_75_feed_break");
         List<JSONObject> result;
         if (startDate.equals(endDate)) {
             //由于时报数据不准,修改逻辑除当日数据外全部请求日报数据